first commit

src/view/inventory/fabricsummary.vue

@@ -46,8 +46,8 @@
                 <!-- <el-table-column  align="left" label="状态" prop="状态" width="100"/> -->
 				<el-table-column  align="left" label="单位" prop="单位" width="70"/>
                 <el-table-column  align="left" label="关联订单" prop="关联订单" width="150"/>
-				<el-table-column  align="left" label="入仓人员" prop="入仓人员" width="100"/>
-				<el-table-column  align="left" label="入仓日期" prop="入仓日期" width="160"/>
+				<el-table-column  align="left" label="操作人员" prop="入仓人员" width="100"/>
+				<el-table-column  align="left" label="操作日期" prop="入仓日期" width="160"/>
 				<el-table-column fixed="right" label="操作" width="130">
 				<template #default="{ row, $index }">
 				  <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 

src/view/inventory/tuihuan.vue

@@ -118,7 +118,18 @@
                <el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
                <el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
                <el-table-column align="left"  label="部门" prop="departname"  width="110"/>
-               <el-table-column align="left"  label="备注" prop="remark"  width="300"/>
+               <!-- <el-table-column align="left"  label="备注" prop="remark"  width="300"/> -->
+			    <el-table-column label="备注" prop="remark" width="300" align="left">
+			   				    <template #default="scope">
+			   				      <el-input class="green-bg-item"
+			   				        v-model="scope.row.remark"
+			   				        size="mini"
+			   				        :min="0"
+			   				        @input="handleInputChange(scope.row)"
+			   				        style="width: 280px;"
+			   				      />
+			   				    </template>
+			   				  </el-table-column>
 			   <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="100"/>

src/view/material/bomproduct.vue

@@ -24,26 +24,26 @@
                         highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                         @row-click="tableRowClick" :show-overflow-tooltip="true"
                         @selection-change="handleSelectionChange">
-               <el-table-column   align="center" label="订单编号" prop="订单编号"  width="100" />
-               <el-table-column   align="center" label="款号" prop="生产款号"  width="100" />
-               <el-table-column   align="center" label="客户" prop="客户编号"  width="73" />
-               <el-table-column   align="center" label="款式" prop="款式"  width="100" />
-               <!-- <el-table-column   align="center" label="物料编码" prop="物料编码"  width="100" /> -->
-               <el-table-column   align="center" label="物料分类" prop="物料分类"  width="73" />
-               <el-table-column   align="center" label="物料名称" prop="物料名称"  width="160" />
-               <el-table-column   align="center" label="计划用料" prop="计划用料"  width="80" />
-               <el-table-column   align="center" label="计划门幅" prop="计划门幅"  width="73" />
-               <el-table-column   align="center" label="定额用料" prop="定额用料"  width="73" />
-               <el-table-column   align="center" label="定额门幅" prop="定额门幅"  width="73" />
-               <!-- <el-table-column   align="center" label="实际门幅" prop="BOM_实际门幅"  width="110" /> -->
-               <el-table-column   align="center" label="实际用料" prop="实际用料"  width="73" />
-               <el-table-column   align="center" label="库存总量" prop="库存总量"  width="80" />
-               <el-table-column   align="center" label="面料结余" prop="面料结余"  width="73" />
-               <el-table-column   align="center" label="退还数量" prop="退还数量"  width="73" />
-               <el-table-column   align="center" label="投料单位" prop="投料单位"  width="73" />
-               <el-table-column   align="center" label="备注" prop="备注"  width="160" />
-               <el-table-column   align="center" label="建档人员" prop="Sys_ID"  width="120" />
-               <el-table-column   align="center" label="建档日期" prop="Sys_rq"  width="160" />
+               <el-table-column   align="left" label="订单编号" prop="订单编号"  width="100" />
+               <el-table-column   align="left" label="生产款号" prop="生产款号"  width="160" />
+               <el-table-column   align="left" label="客户编号" prop="客户编号"  width="73" />
+               <el-table-column   align="left" label="款式" prop="款式"  width="160" />
+               <el-table-column   align="left" label="物料分类" prop="物料分类"  width="73" />
+               <el-table-column   align="left" label="物料名称" prop="物料名称"  width="160" />
+			   <el-table-column   align="left" label="颜色" prop="颜色"  width="90" />
+			   <el-table-column   align="left" label="物料编码" prop="物料编码"  width="200" />
+               <el-table-column   align="left" label="计划用料" prop="计划用料"  width="80" />
+               <el-table-column   align="left" label="计划门幅" prop="计划门幅"  width="73" />
+               <el-table-column   align="left" label="定额用料" prop="定额用料"  width="73" />
+               <el-table-column   align="left" label="定额门幅" prop="定额门幅"  width="73" />
+               <el-table-column   align="left" label="实际用料" prop="实际用料"  width="73" />
+               <el-table-column   align="left" label="库存总量" prop="库存总量"  width="80" />
+               <el-table-column   align="left" label="面料结余" prop="面料结余"  width="73" />
+               <el-table-column   align="left" label="退还数量" prop="退还数量"  width="73" />
+               <el-table-column   align="left" label="投料单位" prop="投料单位"  width="73" />
+               <el-table-column   align="left" label="备注" prop="备注"  width="300" />
+               <el-table-column   align="left" label="建档人员" prop="Sys_ID"  width="160" />
+               <el-table-column   align="left" label="建档日期" prop="Sys_rq"  width="160" />
 
 
                 <!-- <el-table-column fixed="right" label="操作" width="200">

src/view/performance/caiqiebaogong.vue

@@ -42,23 +42,17 @@
 		      	<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
 		      </el-row>
 			  
-			
+			  
+			  
+			  
 			<el-row :gutter="0">
 				<el-col :span="2.5">
-					<el-text style="font-size: 24px; margin-left: 70px;">尺 码&nbsp;</el-text>
+					<el-text style="font-size: 22px; margin-left: 54px;">尺 码&nbsp;</el-text>
 				</el-col>
-				<el-col v-for="(item, index) in 10" :key="index" :span="1" 
+				<el-col v-for="(item, index) in 14" :key="index" :span="1" 
 				:style="{
 				  padding: '0', 
-				  margin: 
-					index < 1 ? '0px 0px 0px 0px': 
-					index < 2 ? '0px 0px 0px 0px': 
-					index < 3 ? '0px 0px 0px 0px': 
-					index < 4 ? '0px 20px 0px 0px':
-					index < 5 ? '0px 27px 0px 0px':
-					index < 6 ? '0px 30px 0px 0px':
-					index < 7 ? '0px 30px 0px 0px':
-					 '0px 20px 0px 0px' 
+				  margin:'0px 15px 0px 0px' 
 				}"
 				>
 					<el-input v-model="cmformdata[`cm${index + 1}`]" :id="`cm${index + 1}`" readonly 
@@ -77,20 +71,12 @@
 					
 			<el-row :gutter="0">
 				<el-col :span="2.5">
-					<el-text style="font-size: 24px; margin-left: 53px;">制单数&nbsp;</el-text>
+					<el-text style="font-size: 22px; margin-left: 38px;">制单数&nbsp;</el-text>
 				</el-col>
-				<el-col v-for="(item, index) in 10" :key="index" :span="1" 
+				<el-col v-for="(item, index) in 14" :key="index" :span="1" 
 				:style="{
 				  padding: '0', 
-				  margin: 
-					index < 1 ? '0px 0px 0px 0px': 
-					index < 2 ? '0px 0px 0px 0px': 
-					index < 3 ? '0px 0px 0px 0px': 
-					index < 4 ? '0px 20px 0px 0px':
-					index < 5 ? '0px 27px 0px 0px':
-					index < 6 ? '0px 30px 0px 0px':
-					index < 7 ? '0px 30px 0px 0px':
-					 '0px 20px 0px 0px' 
+				  margin: '0px 15px 0px 0px' 
 				}"
 				>
 					<el-input v-model="cmslformdata[`cmsl${index + 1}`]" :id="`cmsl${index + 1}`" readonly 
@@ -109,20 +95,12 @@
 			
 			<el-row :gutter="0">
 				<el-col :span="2.5">
-					<el-text style="font-size: 24px; margin-left: 12px;">新增实裁数</el-text>
+					<el-text style="font-size: 22px;">新增实裁数</el-text>
 				</el-col>
-				<el-col v-for="(item, index) in 10" :key="index" :span="1" 
+				<el-col v-for="(item, index) in 14" :key="index" :span="1" 
 				:style="{
 				  padding: '0', 
-				  margin: 
-					index < 1 ? '0px 0px 0px 0px': 
-					index < 2 ? '0px 0px 0px 0px': 
-					index < 3 ? '0px 0px 0px 0px': 
-					index < 4 ? '0px 20px 0px 0px':
-					index < 5 ? '0px 27px 0px 0px':
-					index < 6 ? '0px 30px 0px 0px':
-					index < 7 ? '0px 30px 0px 0px':
-					 '0px 20px 0px 0px' 
+				  margin:'0px 15px 0px 0px' 
 				}"
 				>
 					<el-input v-model="scsformdata[`scs${index + 1}`]" :id="`scs${index + 1}`" @input="updateTotal"  
@@ -138,7 +116,17 @@
 				</el-col>
 				<el-col :span="1"><el-input v-model="scsformdata.sctotal" id="sctotal" readonly style="width: 80px;height: 40px;" /></el-col>
 			</el-row>
-			
+			<br>
+			<el-button  type="danger" icon="delete" @click="del_delclick"
+				  v-if="delall === true" :disabled="Selection === ''"
+				  :style="{
+				    backgroundColor: Selection === '' ? '' : 'red',
+				    borderColor: Selection === '' ? '' : 'red',
+				    color: Selection === '' ? '' : '#fff'
+				  }"
+				  style="width: 130px; height: 40px; font-size: 20px; margin-left: 10px;">删除报工</el-button>
+				  <el-button type="primary" @click="cp_gdprintonClick" style="width: 130px; height: 40px; font-size: 20px; margin-left: 10px;" >  子订单详情页 </el-button>
+				  <el-button type="primary" @click="add_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >报工</el-button>
 			
 		      <el-main>
 				<!-- 表格数据 -->
@@ -238,17 +226,7 @@
 					  </el-tab-pane>
 					</el-tabs>
 					
-					<el-button  type="danger" icon="delete" @click="del_delclick"
-					  v-if="delall === true" :disabled="Selection === ''"
-					  :style="{
-					    backgroundColor: Selection === '' ? '' : 'red',
-					    borderColor: Selection === '' ? '' : 'red',
-					    color: Selection === '' ? '' : '#fff'
-					  }"
-					  style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;">删除报工</el-button>
-					  <el-button type="primary" @click="cp_gdprintonClick" style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;" >  子订单详情页 </el-button>
-					  <el-button type="primary" @click="add_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >报工</el-button>
-				</el-main>
+					</el-main>
 			</div>
 			
 				<!-- 是否订单尾包确认弹窗 -->
@@ -463,6 +441,8 @@ const cmformdata = reactive({
   cm10:'',
   cm11:'',
   cm12:'',
+  cm13:'',
+  cm14:'',
   cmtotal:'合计',
 });
 
@@ -478,6 +458,10 @@ const cmslformdata = reactive({
   cmsl8: '',  
   cmsl9: '',  
   cmsl10: '',  
+  cmsl11: '',
+  cmsl12: '',
+  cmsl13: '',
+  cmsl14: '',
   zdtotal: '' 
 });
 // 实裁数
@@ -492,13 +476,17 @@ const scsformdata = reactive({
   scs8:'',
   scs9:'',
   scs10:'',
+  scs11:'',
+  scs12:'',
+  scs13:'',
+  scs14:'',
   sctotal:'',
 });
 
 //实裁相加
 function updateTotal() {  
   // 直接指定要累加的属性名  
-  const relevantKeys = ['scs1', 'scs2', 'scs3', 'scs4', 'scs5', 'scs6', 'scs7', 'scs8', 'scs9', 'scs10'];  
+  const relevantKeys = ['scs1', 'scs2', 'scs3', 'scs4', 'scs5', 'scs6', 'scs7', 'scs8', 'scs9', 'scs10', 'scs11', 'scs12', 'scs13', 'scs14'];  
   const values = relevantKeys.map(key => parseInt(scsformdata[key], 10) || 0); 
   scsformdata.sctotal = values.reduce((sum, value) => sum + value, 0);  
 }  
@@ -558,8 +546,8 @@ const add_onSubmit = async ()=>{
 	_list.value = getSpotLists.data.list
 	_UniqId.value = getSpotLists.data.list.UniqId
 	
-	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10',];
-	const keys2 = ['cmsl1', 'cmsl2', 'cmsl3', 'cmsl4','cmsl5','cmsl6','cmsl7','cmsl8','cmsl9','cmsl10','zdtotal',];
+	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10','cm11','cm12','cm13','cm14',];
+	const keys2 = ['cmsl1', 'cmsl2', 'cmsl3', 'cmsl4','cmsl5','cmsl6','cmsl7','cmsl8','cmsl9','cmsl10','cmsl11','cmsl12','cmsl13','cmsl14','zdtotal',];
 	if(_order.value.includes('-')){
 		for (let key of keys1) {  
 			if (getSpotLists.data.list.hasOwnProperty(key)) { // 确保键存在于对象中  
@@ -690,15 +678,29 @@ const add_Dialog = async () => {
 	
 	//尺码
 	let cmArray = [cmformdata.cm1, cmformdata.cm2, cmformdata.cm3, cmformdata.cm4, cmformdata.cm5, cmformdata
-		.cm6, cmformdata.cm7, cmformdata.cm8, cmformdata.cm9, cmformdata.cm10
+		.cm6, cmformdata.cm7, cmformdata.cm8, cmformdata.cm9, cmformdata.cm10, cmformdata.cm11, cmformdata.cm12, cmformdata.cm13, cmformdata.cm14
 	];
 	//制单数
 	let zdsl1Array = [cmslformdata.cmsl1, cmslformdata.cmsl2, cmslformdata.cmsl3, cmslformdata.cmsl4,
 		cmslformdata.cmsl5, cmslformdata.cmsl6, cmslformdata.cmsl7, cmslformdata.cmsl8, cmslformdata
-		.cmsl9, cmslformdata.cmsl10
+		.cmsl9, cmslformdata.cmsl10, cmslformdata.cmsl11, cmslformdata.cmsl12, cmslformdata.cmsl13, cmslformdata.cmsl14
 	];
 	//上报数量
-	let scArray = [scsformdata.scs1, scsformdata.scs2, scsformdata.scs3, scsformdata.scs4, scsformdata.scs5, scsformdata.scs6, scsformdata.scs7, scsformdata.scs8, scsformdata.scs9, scsformdata.scs10
+	let scArray = [
+		scsformdata.scs1, 
+		scsformdata.scs2, 
+		scsformdata.scs3, 
+		scsformdata.scs4, 
+		scsformdata.scs5, 
+		scsformdata.scs6, 
+		scsformdata.scs7, 
+		scsformdata.scs8, 
+		scsformdata.scs9, 
+		scsformdata.scs10,
+		scsformdata.scs11, 
+		scsformdata.scs12, 
+		scsformdata.scs13, 
+		scsformdata.scs14, 
 	];
 	let resultArrays = [];
 	for (let i = 0; i < scArray.length; i++) {
@@ -750,6 +752,10 @@ const add_Dialog = async () => {
 		params.scsl8 = scsformdata.scs8
 		params.scsl9 = scsformdata.scs9
 		params.scsl10 = scsformdata.scs10
+		params.scsl11 = scsformdata.scs11
+		params.scsl12 = scsformdata.scs12
+		params.scsl13 = scsformdata.scs13
+		params.scsl14 = scsformdata.scs14
 		params.sctotal = scsformdata['sctotal']
 		params.order_id = add_searchInfo.value;//子订单编号
 		params.rq = currentDates;//时间
@@ -767,7 +773,7 @@ const add_Dialog = async () => {
 			   
 			   // 批量清空新增实裁数input数据
 	           if (scsformdata) {
-	               for (let i = 1; i <= 10; i++) {
+	               for (let i = 1; i <= 14; i++) {
 	                   scsformdata[`scs${i}`] = '';
 	               }
 	               scsformdata.sctotal = '';
@@ -1032,6 +1038,12 @@ const handleSizeChange = (val) => {
 ::v-deep .el-input__wrapper  #cm12{
 	font-size: 20px; 
 }
+::v-deep .el-input__wrapper  #cm13{
+	font-size: 20px; 
+}
+::v-deep .el-input__wrapper  #cm14{
+	font-size: 20px; 
+}
 ::v-deep .el-input__wrapper  #cmtotal{
 	font-size: 20px; 
 }
@@ -1084,10 +1096,65 @@ const handleSizeChange = (val) => {
 	font-size: 20px; 
 	color: red !important;
 }
+::v-deep .el-input__wrapper  #cmsl13{
+	font-size: 20px; 
+	color: red !important;
+}
+::v-deep .el-input__wrapper  #cmsl14{
+	font-size: 20px; 
+	color: red !important;
+}
 ::v-deep .el-input__wrapper  #zdtotal{
 	font-size: 20px; 
   color: red !important;
 }
+::v-deep .el-input__wrapper  #scs1{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs2{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs3{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs4{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs5{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs6{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs7{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs8{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs9{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs10{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs11{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs12{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs13{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #scs14{
+	font-size: 18px; 
+}
+::v-deep .el-input__wrapper  #sctotal{
+	font-size: 18px; 
+}
+
+
 /* 表格复选框大小调整 */
 :deep(.el-checkbox.el-checkbox--small .el-checkbox__inner) {
 	width: 30px;

src/view/performance/chafengbaogong.vue

@@ -73,24 +73,17 @@
 					  
 					  <el-row :gutter="0">
 					    <el-col :span="2.5">
-					      <el-text style="font-size: 24px; margin-left: 45px;">尺 码&nbsp;</el-text>
+					      <el-text style="font-size: 24px; margin-left: 37px;">尺 码&nbsp;</el-text>
 					    </el-col>
 					  
 					    <!-- 动态生成输入框 -->
 					    <el-col 
-					      v-for="(item, index) in 10" 
+					      v-for="(item, index) in 14" 
 					      :key="index" 
 					      :span="1" 
 					      :style="{
 					        padding: '0', 
-					        margin: 
-							index < 2 ? '0' : 
-							index < 3 ? '0px 9px 0px 0px': 
-							index < 4 ? '0px 19px 0px 0px':
-							index < 5 ? '0px 29px 0px 0px':
-							index < 6 ? '0px 30px 0px 0px':
-							index < 7 ? '0px 40px 0px 0px':
-							 '0px 20px 0px 0px' 
+					        margin:'0px 16px 0px 0px' 
 					      }"
 					    >
 					      <el-input 
@@ -113,40 +106,17 @@
 					      <el-input v-model="cmformdata.cmtotal" id="cmtotal" readonly style="width: 65px; height: 40px;" />
 					    </el-col>
 					  
-					    <!-- 删除报工按钮 -->
-					    <el-col :span="2">
-					      <el-button  
-					        type="danger" 
-					        icon="delete" 
-					        @click="del_delclick"
-					        v-if="delall === true" 
-					        :disabled="Selection === ''"
-					        :style="{
-					          backgroundColor: Selection === '' ? '' : 'red',
-					          borderColor: Selection === '' ? '' : 'red',
-					          color: Selection === '' ? '' : '#fff'
-					        }"
-					        style="width: 130px; height: 40px; font-size: 20px; margin-left: 20px;">
-					        删除报工
-					      </el-button>
-					    </el-col>
+					   
 					  </el-row>
 					  
 					  <el-row :gutter="0">
 					  	<el-col :span="2.5">
-					  		<el-text style="font-size: 24px; margin-left: 35px;">制单数</el-text>
+					  		<el-text style="font-size: 24px; margin-left: 25px;">制单数</el-text>
 					  	</el-col>
-					  	<el-col v-for="(item, index) in 10" :key="index" :span="1" 
+					  	<el-col v-for="(item, index) in 14" :key="index" :span="1" 
 						:style="{
 						  padding: '0', 
-						  margin: 
-													index < 2 ? '0' : 
-													index < 3 ? '0px 9px 0px 0px': 
-													index < 4 ? '0px 19px 0px 0px':
-													index < 5 ? '0px 29px 0px 0px':
-													index < 6 ? '0px 30px 0px 0px':
-													index < 7 ? '0px 40px 0px 0px':
-													 '0px 20px 0px 0px' 
+						  margin:'0px 16px 0px 0px' 
 						}"
 						>
 					  		<el-input v-model="zdslformdata[`cmsl${index + 1}`]" :id="`cm${index + 1}`" readonly 
@@ -161,24 +131,16 @@
 							/>
 					  	</el-col>
 					  	<el-col :span="1"><el-input v-model="zdslformdata.zdtotal" id="zdtotal" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-button type="primary" @click="cp_gdprintonClick" style="width: 130px; height: 40px; font-size: 20px; margin-left: 20px;" >  子订单详情页 </el-button>
 					  </el-row>
 					  
 					  <el-row :gutter="0">
 					  	<el-col :span="2.5">
-					  		<el-text style="font-size: 24px; margin-left: 35px;">实裁数</el-text>
+					  		<el-text style="font-size: 24px; margin-left: 25px;">实裁数</el-text>
 					  	</el-col>
-					  	<el-col v-for="(item, index) in 10" :key="index" :span="1" 
+					  	<el-col v-for="(item, index) in 14" :key="index" :span="1" 
 						:style="{
 						  padding: '0', 
-						  margin: 
-													index < 2 ? '0' : 
-													index < 3 ? '0px 9px 0px 0px': 
-													index < 4 ? '0px 19px 0px 0px':
-													index < 5 ? '0px 29px 0px 0px':
-													index < 6 ? '0px 30px 0px 0px':
-													index < 7 ? '0px 40px 0px 0px':
-													 '0px 20px 0px 0px' 
+						  margin: '0px 16px 0px 0px' 
 						}"
 						>
 					  		<el-input v-model="scslformdata[`scsl${index + 1}`]" :id="`scsl${index + 1}`" readonly 
@@ -196,165 +158,184 @@
 					  </el-row>
 					  
 					  <el-row :gutter="0">
-					   <el-col :span="2.5"><el-text style="font-size: 24px;margin-left: 10px;">上报数量</el-text></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 1px 0px 0px;">
+					   <el-col :span="2.5"><el-text style="font-size: 24px;">上报数量</el-text></el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl1" id="sl1"  :readonly="!scslformdata.scsl1" @input="updateTotal" style="width: 70px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 0px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl2" id="sl2"  :readonly="!scslformdata.scsl2" @input="updateTotal" style="width: 70px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 9px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl3" id="sl3"  :readonly="!scslformdata.scsl3" @input="updateTotal" style="width: 73px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 20px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl4" id="sl4"  :readonly="!scslformdata.scsl4" @input="updateTotal" style="width: 75px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 30px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl5" id="sl5"  :readonly="!scslformdata.scsl5" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 30px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl6" id="sl6"  :readonly="!scslformdata.scsl6" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 39px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl7" id="sl7"  :readonly="!scslformdata.scsl7" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 20px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl8" id="sl8"  :readonly="!scslformdata.scsl8" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 20px 0px 0px;">
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
 						   <el-input v-model="slformdata.sl9" id="sl9"  :readonly="!scslformdata.scsl9" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
-					   <el-col :span="1" style="padding-right: 0px;margin: 0px 20px 0px 0px;">
-						   <el-input v-model="slformdata.sl10" id="sl10"  :readonly="!scslformdata.scsl10" @input="updateTotal" style="width: 100px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
+						   <el-input v-model="slformdata.sl10" id="sl10"  :readonly="!scslformdata.scsl10" @input="updateTotal" style="width: 100px;height: 40px;" />
+					   </el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
+						   <el-input v-model="slformdata.sl11" id="sl11"  :readonly="!scslformdata.scsl11" @input="updateTotal" style="width: 100px;height: 40px;" />
+					   </el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
+						   <el-input v-model="slformdata.sl12" id="sl12"  :readonly="!scslformdata.scsl12" @input="updateTotal" style="width: 100px;height: 40px;" />
+					   </el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
+						   <el-input v-model="slformdata.sl13" id="sl13"  :readonly="!scslformdata.scsl13" @input="updateTotal" style="width: 100px;height: 40px;" />
+					   </el-col>
+					   <el-col :span="1" style="padding-right: 0px;margin: 0px 16px 0px 0px;">
+						   <el-input v-model="slformdata.sl14" id="sl14"  :readonly="!scslformdata.scsl14" @input="updateTotal" style="width: 100px;height: 40px;" />
+					   </el-col>
 					   <el-col :span="1"><el-input v-model="slformdata.sctotal" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
-					    <el-col :span="2">
-					      <el-button type="primary" @click="add_Dialog" style="width: 130px; height: 40px; font-size: 20px; margin-left: 20px;" >报工</el-button>
-					    </el-col>
 					  </el-row>
+					<br>
+						<el-button type="danger" icon="delete" @click="del_delclick"
+						v-if="delall === true" :disabled="Selection === ''"
+						:style="{
+							backgroundColor: Selection === '' ? '' : 'red',
+							borderColor: Selection === '' ? '' : 'red',
+							color: Selection === '' ? '' : '#fff'
+						}"
+						style="width: 130px; height: 40px; font-size: 20px; margin-left: 20px;">删除报工</el-button>
+						<el-button type="primary" @click="cp_gdprintonClick" style="width: 130px; height: 40px; font-size: 20px; margin-left: 20px;" >  子订单详情页 </el-button>
+						<el-button type="primary" @click="add_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 20px;" >报工</el-button>
+							
+					<!-- 表格数据 -->
+					  <el-tabs v-model="activeName">
+						<el-tab-pane label="报工历史记录"  name="first">
+					<el-table
+						ref="multipleTable"
+						style="width: 100%; height: 52vh"
+						tooltip-effect="dark"
+						:row-style="{ height: '50px' }"
+						:header-cell-style="{ padding: '5px', fontSize: '20px' }"
+						:cell-style="{ padding: '10px', fontSize: '20px' }"
+						:header-row-style="{ height: '20px' }"
+						:data="add_tableData"
+						border
+						row-key="ID"
+						size="small"
+						highlight-current-row="true"
+						@row-dblclick="updateCompanyFunc"
+						@row-click="tableRowClick"
+						:show-overflow-tooltip="true"
+						@selection-change="selectionChange"
+					>
+					<el-table-column type="selection" width="60" />
+						<!-- 操作列 -->
+						<el-table-column align="left" label="操作" width="150">
+							<template v-slot="scope">
+								<!-- 当 sys_rq、组别和 serial 不为空时显示按钮 -->
+								<el-button
+									v-if="scope.row.sys_rq && scope.row.组别 && scope.row.serial"
+									type="primary"
+									@click="add_bdprintxp(scope.row)"
+									style="width: 110px; height: 40px; font-size: 20px;"
+								>
+									补打小票
+								</el-button>
+							</template>
+						</el-table-column>
 					
-
+						<!-- 报工时间 -->
+						<el-table-column align="center" label="报工时间" prop="sys_rq" width="150" />
 					
-							<!-- 表格数据 -->
-							  <el-tabs v-model="activeName">
-								<el-tab-pane label="报工历史记录"  name="first">
-							<el-table
-							    ref="multipleTable"
-							    style="width: 100%; height: 52vh"
-							    tooltip-effect="dark"
-							    :row-style="{ height: '50px' }"
-							    :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-							    :cell-style="{ padding: '10px', fontSize: '20px' }"
-							    :header-row-style="{ height: '20px' }"
-							    :data="add_tableData"
-							    border
-							    row-key="ID"
-							    size="small"
-							    highlight-current-row="true"
-							    @row-dblclick="updateCompanyFunc"
-							    @row-click="tableRowClick"
-							    :show-overflow-tooltip="true"
-							    @selection-change="selectionChange"
-							>
-							<el-table-column type="selection" width="60" />
-							    <!-- 操作列 -->
-							    <el-table-column align="left" label="操作" width="150">
-							        <template v-slot="scope">
-							            <!-- 当 sys_rq、组别和 serial 不为空时显示按钮 -->
-							            <el-button
-							                v-if="scope.row.sys_rq && scope.row.组别 && scope.row.serial"
-							                type="primary"
-							                @click="add_bdprintxp(scope.row)"
-							                style="width: 110px; height: 40px; font-size: 20px;"
-							            >
-							                补打小票
-							            </el-button>
-							        </template>
-							    </el-table-column>
-							
-							    <!-- 报工时间 -->
-							    <el-table-column align="center" label="报工时间" prop="sys_rq" width="150" />
-							
-							    <!-- 子订单编号 -->
-							    <el-table-column align="center" label="子订单编号" prop="子订单编号" width="110" />
-							
-							    <!-- 组别 -->
-							    <el-table-column align="center" label="组别" prop="组别" width="80" />
-							
-							    <!-- 尺码列表 -->
-							    <el-table-column
-							        v-for="item in sizeDatas"
-							        :key="item"
-							        align="center"
-							        :label="item"
-							        width="100"
-							        :cell-style="cellStyle"
-							    >
-							        <template v-slot="scope">
-							            <div
-							                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
-							                style="margin-left: -5px; width: 80px;"
-							                @click="handleSizeClick(scope.$index, item, scope.row)"
-							            >
-							                {{ scope.row[item] || '—' }} 
-							            </div>
-							        </template>
-							    </el-table-column>
-							
-							    <!-- 数量 -->
-							    <el-table-column align="left" sortable label="数量" prop="数量" width="100" />
-							
-							    <!-- 流水号 -->
-							    <el-table-column align="center" label="流水号" width="150">
-							        <template v-slot="scope">
-							            <!-- 当 sys_rq、组别和 serial 不为空时显示流水号 -->
-							            <div v-if="scope.row.sys_rq && scope.row.组别 && scope.row.serial">
-							                第{{ scope.row.serial }}包
-							            </div>
-							        </template>
-							     </el-table-column>
-							</el-table>
-								</el-tab-pane>
-							
-							
-							<el-tab-pane label="订单资料附件" name="third">
-							  <el-table ref="multipleTable"
-										:row-style="{ height: '30px' }"
-										:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-										:header-cell-style="{ padding: '0px' }"
-										:show-overflow-tooltip="true"
-										:cell-class-name="planUsageCellClass"
-										highlight-current-row="true"
-										@row-dblclick="gdbomupdateCompanyFunc"
-										style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
-													   @selection-change="fjSelectionChange">
-							   <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-							   <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="sys_rq"  width="160"/>
-							   <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-											 <el-table-column align="left" label="操作"width="100"fixed="right">
-											   <template #default="scope">
-												 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-											   </template>
-											 </el-table-column>
-							  </el-table>
-							</el-tab-pane> 
-							
-							
-							<el-tab-pane label="技术附件" @click="showTable('技术附件')" name="fourth">
-								<el-table ref="multipleTable"
-												  :row-style="{ height: '30px' }"
-												  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-												  :header-cell-style="{ padding: '0px' }"
-												  :show-overflow-tooltip="true"
-												  :cell-class-name="planUsageCellClass"
-												  highlight-current-row="true"
-												  @row-dblclick="ExcelShow"
-												  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
-											  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-											  <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="sys_rq"  width="160"/>
-											  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-											  <el-table-column align="left" label="操作"width="100"fixed="right">
-												<template #default="scope">
-												  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-												</template>
-											  </el-table-column>
-								</el-table>
-							  </el-tab-pane>
-							</el-tabs>
+						<!-- 子订单编号 -->
+						<el-table-column align="center" label="子订单编号" prop="子订单编号" width="110" />
+					
+						<!-- 组别 -->
+						<el-table-column align="center" label="组别" prop="组别" width="80" />
+					
+						<!-- 尺码列表 -->
+						<el-table-column
+							v-for="item in sizeDatas"
+							:key="item"
+							align="center"
+							:label="item"
+							width="100"
+							:cell-style="cellStyle"
+						>
+							<template v-slot="scope">
+								<div
+									:class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
+									style="margin-left: -5px; width: 80px;"
+									@click="handleSizeClick(scope.$index, item, scope.row)"
+								>
+									{{ scope.row[item] || '—' }} 
+								</div>
+							</template>
+						</el-table-column>
+					
+						<!-- 数量 -->
+						<el-table-column align="left" sortable label="数量" prop="数量" width="100" />
+					
+						<!-- 流水号 -->
+						<el-table-column align="center" label="流水号" width="150">
+							<template v-slot="scope">
+								<!-- 当 sys_rq、组别和 serial 不为空时显示流水号 -->
+								<div v-if="scope.row.sys_rq && scope.row.组别 && scope.row.serial">
+									第{{ scope.row.serial }}包
+								</div>
+							</template>
+						 </el-table-column>
+					</el-table>
+						</el-tab-pane>
+					
+					
+					<el-tab-pane label="订单资料附件" name="third">
+					  <el-table ref="multipleTable"
+								:row-style="{ height: '30px' }"
+								:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+								:header-cell-style="{ padding: '0px' }"
+								:show-overflow-tooltip="true"
+								:cell-class-name="planUsageCellClass"
+								highlight-current-row="true"
+								@row-dblclick="gdbomupdateCompanyFunc"
+								style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
+											   @selection-change="fjSelectionChange">
+					   <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+					   <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="sys_rq"  width="160"/>
+					   <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+									 <el-table-column align="left" label="操作"width="100"fixed="right">
+									   <template #default="scope">
+										 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+									   </template>
+									 </el-table-column>
+					  </el-table>
+					</el-tab-pane> 
+					
+					
+					<el-tab-pane label="技术附件" @click="showTable('技术附件')" name="fourth">
+						<el-table ref="multipleTable"
+										  :row-style="{ height: '30px' }"
+										  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+										  :header-cell-style="{ padding: '0px' }"
+										  :show-overflow-tooltip="true"
+										  :cell-class-name="planUsageCellClass"
+										  highlight-current-row="true"
+										  @row-dblclick="ExcelShow"
+										  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
+									  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+									  <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="sys_rq"  width="160"/>
+									  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+									  <el-table-column align="left" label="操作"width="100"fixed="right">
+										<template #default="scope">
+										  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+										</template>
+									  </el-table-column>
+						</el-table>
+					  </el-tab-pane>
+					</el-tabs>
 
 				</div>
 
@@ -561,6 +542,10 @@ const showPdf = async (row) => {
 		cm8: '',
 		cm9: '',
 		cm10: '',
+		cm11: '',
+		cm12: '',
+		cm13: '',
+		cm14: '',
 		cmtotal: '合计',
 	});
 	// 制单数
@@ -575,6 +560,10 @@ const showPdf = async (row) => {
 		cmsl8: '',
 		cmsl9: '',
 		cmsl10: '',
+		cmsl11: '',
+		cmsl12: '',
+		cmsl13: '',
+		cmsl14: '',
 		zdtotal: '',
 	});
 	// 实裁量
@@ -589,6 +578,10 @@ const showPdf = async (row) => {
 		scsl8: '',
 		scsl9: '',
 		scsl10: '',
+		scsl11: '',
+		scsl12: '',
+		scsl13: '',
+		scsl14: '',
 		sctotal: '',
 	});
 	// 数量
@@ -603,23 +596,23 @@ const showPdf = async (row) => {
 		sl8: '',
 		sl9: '',
 		sl10: '',
+		sl11: '',
+		sl12: '',
+		sl13: '',
+		sl14: '',
 		sctotal: '',
 	});
 
-//实裁相加
-function updateTotal() {
-	// 直接指定要累加的属性名  
-	const relevantKeys = ['sl1', 'sl2', 'sl3', 'sl4', 'sl5', 'sl6', 'sl7', 'sl8', 'sl9', 'sl10'];
-	const values = relevantKeys.map(key => parseInt(slformdata[key], 10) ||
-	0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-	slformdata.sctotal = values.reduce((sum, value) => sum + value, 0);
-	
-	const relevantKeyss = ['scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 'scsl8', 'scsl9', 'scsl0'];
-	const valuess = relevantKeyss.map(key => parseInt(scslformdata[key], 10) ||
-	0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-	scslformdata.sctotal = valuess.reduce((sum, value) => sum + value, 0);
+	//实裁相加，直接指定要累加的属性名  
+	function updateTotal() {
+		const relevantKeys = ['sl1', 'sl2', 'sl3', 'sl4', 'sl5', 'sl6', 'sl7', 'sl8', 'sl9', 'sl10', 'sl11', 'sl12', 'sl13', 'sl14'];
+		const values = relevantKeys.map(key => parseInt(slformdata[key], 10) ||0);
+		slformdata.sctotal = values.reduce((sum, value) => sum + value, 0);
 
-}
+		const relevantKeyss = ['scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 'scsl8', 'scsl9', 'scsl0', 'scsl1', 'scsl2', 'scsl3', 'scsl4'];
+		const valuess = relevantKeyss.map(key => parseInt(scslformdata[key], 10) ||0);
+		scslformdata.sctotal = valuess.reduce((sum, value) => sum + value, 0);
+	}
 
 
 	//历史记录表格
@@ -696,12 +689,17 @@ function updateTotal() {
 			_serial_num.value  = String(getSpotLists.data.serial_num);//序号
 				console.log(_serial_num.value)
 			//获取尺码、制单数/实裁量上面信息
-			const keys1 = ['cm1', 'cm2', 'cm3', 'cm4', 'cm5', 'cm6', 'cm7', 'cm8', 'cm9', 'cm10', ];
-			const keys2 = ['cmsl1', 'cmsl2', 'cmsl3', 'cmsl4', 'cmsl5', 'cmsl6', 'cmsl7', 'cmsl8', 'cmsl9',
-				'cmsl10', 'zdtotal',
+			const keys1 = [
+				'cm1', 'cm2', 'cm3', 'cm4', 'cm5', 'cm6', 'cm7', 
+				'cm8', 'cm9', 'cm10', 'cm11', 'cm12', 'cm13', 'cm14'
 			];
-			const keys3 = ['scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 'scsl8', 'scsl9',
-				'scsl10', 'sctotal',
+			const keys2 = [
+				'cmsl1', 'cmsl2', 'cmsl3', 'cmsl4', 'cmsl5', 'cmsl6', 'cmsl7',
+				'cmsl8', 'cmsl9','cmsl10','cmsl11','cmsl12','cmsl13','cmsl14', 'zdtotal',
+			];
+			const keys3 = [
+				'scsl1', 'scsl2', 'scsl3', 'scsl4', 'scsl5', 'scsl6', 'scsl7', 
+				'scsl8', 'scsl9','scsl10','scsl11','scsl12','scsl13','scsl14', 'sctotal',
 			];
 			//如果搜索是子订单编号
 			if (add_searchInfo.value.includes('-')) {
@@ -743,26 +741,26 @@ function updateTotal() {
 	}
 	
 
-	const AttendanceVisible = ref(false)
-
-	//清空对象的属性值
-	const gd_clearFormData = () => {
-		Object.keys(add_formData).forEach(key => {
-			add_formData[key] = '';
-		});
-	};
+const AttendanceVisible = ref(false)
 
-	const add_formData = reactive({
-		机台号: '',
-		工序: '',
-		组别: '',
-		人员: '',
-		尺码: '',
-		数量: '',
-		是否订单尾包: '0',
+//清空对象的属性值
+const gd_clearFormData = () => {
+	Object.keys(add_formData).forEach(key => {
+		add_formData[key] = '';
 	});
+};
 
-	const currentSlValue = ref('')
+const add_formData = reactive({
+	机台号: '',
+	工序: '',
+	组别: '',
+	人员: '',
+	尺码: '',
+	数量: '',
+	是否订单尾包: '0',
+});
+
+const currentSlValue = ref('')
 	
 
 // 标志变量，用于控制按钮的可点击状态
@@ -797,17 +795,19 @@ const add_Dialog = async () => {
 			return fasle;
 		}
 		//尺码
-		let cmArray = [cmformdata.cm1, cmformdata.cm2, cmformdata.cm3, cmformdata.cm4, cmformdata.cm5, cmformdata
-			.cm6, cmformdata.cm7, cmformdata.cm8, cmformdata.cm9, cmformdata.cm10
+		let cmArray = [
+			cmformdata.cm1, cmformdata.cm2, cmformdata.cm3, cmformdata.cm4, cmformdata.cm5, cmformdata.cm6, cmformdata.cm7, 
+			cmformdata.cm8, cmformdata.cm9, cmformdata.cm10, cmformdata.cm11, cmformdata.cm12, cmformdata.cm13, cmformdata.cm14
 		];
 		//制单数
-		let zdsl1Array = [zdslformdata.zdsl1, zdslformdata.zdsl12, zdslformdata.zdsl13, zdslformdata.zdsl14,
-			zdslformdata.zdsl15, zdslformdata.zdsl16, zdslformdata.zdsl17, zdslformdata.zdsl18, zdslformdata
-			.zdsl19, zdslformdata.zdsl110
+		let zdsl1Array = [
+			zdslformdata.zdsl1, zdslformdata.zdsl2, zdslformdata.zdsl3, zdslformdata.zdsl4,zdslformdata.zdsl5, zdslformdata.zdsl6, zdslformdata.zdsl7, 
+			zdslformdata.zdsl8, zdslformdata.zdsl9,zdslformdata.zdsl10, zdslformdata.zdsl11, zdslformdata.zdsl12, zdslformdata.zdsl13, zdslformdata.zdsl14
 		];
 		//上报数量
-		let slArray = [slformdata.sl1, slformdata.sl2, slformdata.sl3, slformdata.sl4, slformdata.sl5, slformdata
-			.sl6, slformdata.sl7, slformdata.sl8, slformdata.sl9, slformdata.sl10
+		let slArray = [
+			slformdata.sl1, slformdata.sl2, slformdata.sl3, slformdata.sl4, slformdata.sl5, slformdata.sl6, slformdata.sl7, 
+			slformdata.sl8, slformdata.sl9, slformdata.sl10, slformdata.sl11, slformdata.sl12, slformdata.sl13, slformdata.sl14
 		];
 		let resultArrays = [];
 		for (let i = 0; i < slArray.length; i++) {
@@ -896,7 +896,7 @@ const add_Dialog = async () => {
 			});
 			// 上报成功后 清空所有输入框上报数量
 			  if (slformdata) {
-			    for (let i = 1; i <= 10; i++) {
+			    for (let i = 1; i <= 14; i++) {
 			      slformdata['sl' + i] = '';
 			    }
 			    // 清空总和
@@ -1070,11 +1070,13 @@ const _print = ref('')
 // 打印预览
 const add_printxp = async () => {
 	console.log("打印小票")
-	let cmArray = [cmformdata.cm1, cmformdata.cm2, cmformdata.cm3, cmformdata.cm4, cmformdata.cm5, cmformdata.cm6,
-		cmformdata.cm7, cmformdata.cm8, cmformdata.cm9, cmformdata.cm10
+	let cmArray = [
+		cmformdata.cm1, cmformdata.cm2, cmformdata.cm3, cmformdata.cm4, cmformdata.cm5, cmformdata.cm6,cmformdata.cm7, 
+		cmformdata.cm8, cmformdata.cm9, cmformdata.cm10, cmformdata.cm11, cmformdata.cm12, cmformdata.cm13, cmformdata.cm14
 	];
-	let slArray = [slformdata.sl1, slformdata.sl2, slformdata.sl3, slformdata.sl4, slformdata.sl5, slformdata.sl6,
-		slformdata.sl7, slformdata.sl8, slformdata.sl9, slformdata.sl10
+	let slArray = [
+		slformdata.sl1, slformdata.sl2, slformdata.sl3, slformdata.sl4, slformdata.sl5, slformdata.sl6,slformdata.sl7, 
+		slformdata.sl8, slformdata.sl9, slformdata.sl10, slformdata.sl11, slformdata.sl12, slformdata.sl13, slformdata.sl14
 	];
 	let allParams = []; // 用于存储所有要打印的参数对象  
 	let allParamss = ref([]); // 用于存储所有要打印的参数对象
@@ -1441,6 +1443,18 @@ const handleSizeChange = (val) => {
 	::v-deep .el-input__wrapper #cm11 {
 		font-size: 19px;
 	}
+	::v-deep .el-input__wrapper #cm12 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #cm13 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #cm14 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #cm15 {
+		font-size: 19px;
+	}
 	::v-deep .el-input__wrapper #cmtotal {
 		font-size: 19px;
 	}
@@ -1485,6 +1499,18 @@ const handleSizeChange = (val) => {
 	::v-deep .el-input__wrapper #zdsc10 {
 		font-size: 19px;
 	}
+	::v-deep .el-input__wrapper #zdsc11 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #zdsc12 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #zdsc13 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #zdsc14 {
+		font-size: 19px;
+	}
 
 	::v-deep .el-input__wrapper #zdtotal {
 		font-size: 19px;
@@ -1540,6 +1566,22 @@ const handleSizeChange = (val) => {
 		font-size: 19px;
 		color: red !important;
 	}
+	::v-deep .el-input__wrapper #scsl11 {
+		font-size: 19px;
+		color: red !important;
+	}
+	::v-deep .el-input__wrapper #scsl12 {
+		font-size: 19px;
+		color: red !important;
+	}
+	::v-deep .el-input__wrapper #scsl13 {
+		font-size: 19px;
+		color: red !important;
+	}
+	::v-deep .el-input__wrapper #scsl14 {
+		font-size: 19px;
+		color: red !important;
+	}
 
 	::v-deep .el-input__wrapper #sctotal {
 		font-size: 19px;
@@ -1586,6 +1628,18 @@ const handleSizeChange = (val) => {
 	::v-deep .el-input__wrapper #sl10 {
 		font-size: 19px;
 	}
+	::v-deep .el-input__wrapper #sl11 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #sl12 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #sl13 {
+		font-size: 19px;
+	}
+	::v-deep .el-input__wrapper #sl14 {
+		font-size: 19px;
+	}
 
 	::v-deep .el-input__wrapper #sctotal {
 		font-size: 19px;

src/view/performance/chukubaogong.vue

@@ -118,7 +118,18 @@
 				<el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
 				<el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
 				<el-table-column align="left"  label="部门" prop="departname"  width="110"/>
-				<el-table-column align="left"  label="备注" prop="remark"  width="300"/>
+				<!-- <el-table-column align="left"  label="备注" prop="remark"  width="300"/> -->
+				<el-table-column label="备注" prop="remark" width="300" align="left">
+				  <template #default="scope">
+				    <el-input class="green-bg-item"
+				      v-model="scope.row.remark"
+				      size="mini"
+				      :min="0"
+				      @input="handleInputChange(scope.row)"
+				      style="width: 280px;"
+				    />
+				  </template>
+				</el-table-column>
 				<el-table-column align="left"  label="出库人员" prop="操作机台"  width="100"/>
 				<el-table-column align="left"  label="出库日期" prop="日期"  width="100"/>
 				<el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -54,25 +54,25 @@
 				  <el-table-column align="center" type="selection" width="40"/>
 				  <el-table-column align="center"  label="附件"     	prop="status" 	width="60" />
 				  <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="110" />
-				  <el-table-column align="left"  label="客户"      	prop="客户编号" 		width="80" />
+				  <el-table-column align="left"  label="客户"      	prop="客户编号" 		width="70" />
 				  <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="left" label="状态" prop="gd_statu" width="65" >
+				  <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>
-				  <el-table-column align="left"  label="落货日期"   	prop="落货日期" 	width="120" />
+				  <el-table-column align="left"  label="落货日期"   	prop="落货日期" 	width="100" />
 				  <el-table-column align="left"  label="船样"    	prop="船样合计" 	width="60" />
 				  <el-table-column align="left"  label="船样描述"    	prop="船样描述" 	width="110" />
 				  <el-table-column align="left"  label="单位"    		prop="单位" 		width="60" />
 				  <el-table-column align="left"  label="面料"       	prop="面料" 		width="180" />
-				  <el-table-column align="left"  label="备注"       	prop="要求" 		width="130" />
-				  <el-table-column align="left"  label="粘衬"        	prop="粘衬"		width="80" />
-				  <el-table-column align="left"  label="箱唛要求"   	prop="箱唛要求" 	width="110" />
+				  <el-table-column align="left"  label="备注"       	prop="要求" 		width="180" />
+				  <el-table-column align="left"  label="粘衬"        	prop="粘衬"		width="180" />
+				  <el-table-column align="left"  label="箱唛要求"   	prop="箱唛要求" 	width="180" />
 				  <el-table-column align="left"  label="制单人"    	prop="Sys_id" 	width="160" />
 				  <el-table-column align="left"  label="制单日期"    	prop="Sys_rq" 	width="160" />
 				</el-table>
@@ -116,7 +116,7 @@
 					<el-table-column align="left" sortable label="制单总数" prop="zdtotal"  width="110"/>
 					<el-table-column align="left" sortable label="建档用户" prop="Sys_id"  width="160"/>
 					<el-table-column align="left" sortable label="建档时间" prop="Sys_rq"  width="160"/>
-					<el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="110"/>
+					<el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="160"/>
 				  </el-table>
 				</el-tab-pane>
   
@@ -345,6 +345,11 @@
 							   <el-input v-model="edit_cmformdata.cm8" readonly style="width: 80px;" />
 							   <el-input v-model="edit_cmformdata.cm9" readonly style="width: 80px;" />
 							   <el-input v-model="edit_cmformdata.cm10" readonly style="width: 80px;" />
+							   <el-input v-model="edit_cmformdata.cm11" readonly style="width: 80px;" />
+							   <el-input v-model="edit_cmformdata.cm12" readonly style="width: 80px;" />
+							   <el-input v-model="edit_cmformdata.cm13" readonly style="width: 80px;" />
+							   <el-input v-model="edit_cmformdata.cm14" readonly style="width: 80px;" />
+							   <el-input v-model="edit_cmformdata.sctotal" readonly style="width: 80px;" />
 						   </el-form-item>
 					   </div>
 				   </el-col>
@@ -354,16 +359,21 @@
 				   <el-col :span="20">
 					   <div style="display: flex; gap: 0px;">
 						   <el-form-item label="制单数:" class="mab" prop="keyOrder" label-width='110'>
-							   <el-input v-model="edit_zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id="zds1" @keydown="add_gdzlent($event, '是否船样', 'zds1', 'zds2')" />
-							   <el-input v-model="edit_zdsformdata.zds2" @input="updateTotal" style="width: 80px;" id="zds2" @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')" />
-							   <el-input v-model="edit_zdsformdata.zds3" @input="updateTotal" style="width: 80px;" id="zds3" @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')" />
-							   <el-input v-model="edit_zdsformdata.zds4" @input="updateTotal" style="width: 80px;" id="zds4" @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')" />
-							   <el-input v-model="edit_zdsformdata.zds5" @input="updateTotal" style="width: 80px;" id="zds5" @keydown="add_gdzlent($event, 'zds4', 'zds5', 'zds6')" />
-							   <el-input v-model="edit_zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id="zds6" @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')" />
-							   <el-input v-model="edit_zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id="zds7" @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')" />
-							   <el-input v-model="edit_zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id="zds8" @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')" />
-							   <el-input v-model="edit_zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id="zds9" @keydown="add_gdzlent($event, 'zds8', 'zds9', '色系名称')" />
-							   <el-input v-model="edit_zdsformdata.zds10" readonly style="width: 80px;" />
+							   <el-input v-model="edit_zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id ='zds1'  @keydown="add_gdzlent($event, 'cm14', 'zds1', 'zds2')"/>
+							   <el-input v-model="edit_zdsformdata.zds2" @input="updateTotal" style="width: 80px;" id ='zds2'  @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')"/>
+							   <el-input v-model="edit_zdsformdata.zds3" @input="updateTotal" style="width: 80px;" id ='zds3'  @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')"/>
+							   <el-input v-model="edit_zdsformdata.zds4" @input="updateTotal" style="width: 80px;" id ='zds4'  @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')"/>
+							   <el-input v-model="edit_zdsformdata.zds5" @input="updateTotal" style="width: 80px;" id ='zds5'  @keydown="add_gdzlent($event, 'zds4', 'zds5', 'zds6')"/>
+							   <el-input v-model="edit_zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id ='zds6'  @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')"/>
+							   <el-input v-model="edit_zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id ='zds7'  @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')"/>
+							   <el-input v-model="edit_zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id ='zds8'  @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')"/>
+							   <el-input v-model="edit_zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id ='zds9'  @keydown="add_gdzlent($event, 'zds8', 'zds9', 'zds10')"/>
+							   <el-input v-model="edit_zdsformdata.zds10" @input="updateTotal" style="width: 80px;" id ='zds10'  @keydown="add_gdzlent($event, 'zds9', 'zds10', 'zds11')"/>
+							   <el-input v-model="edit_zdsformdata.zds11" @input="updateTotal" style="width: 80px;" id ='zds11'  @keydown="add_gdzlent($event, 'zds10', 'zds11', 'zds12')"/>
+							   <el-input v-model="edit_zdsformdata.zds12" @input="updateTotal" style="width: 80px;" id ='zds12'  @keydown="add_gdzlent($event, 'zds11', 'zds12', 'zds13')"/>
+							   <el-input v-model="edit_zdsformdata.zds13" @input="updateTotal" style="width: 80px;" id ='zds13'  @keydown="add_gdzlent($event, 'zds12', 'zds13', 'zds14')"/>
+							   <el-input v-model="edit_zdsformdata.zds14" @input="updateTotal" style="width: 80px;" id ='zds14'  @keydown="add_gdzlent($event, 'zds13', 'zds14', '色系名称')"/>
+							   <el-input v-model="edit_zdsformdata.zdtotal" readonly style="width: 80px;" />
 						   </el-form-item>
 					   </div>
 				   </el-col>
@@ -405,6 +415,7 @@
 					  </el-form-item>
 					  <el-form-item label="订单数量" label-width="100px">
 						<el-input v-model="add_gdscgdformData.订单数量" id="订单数量"
+						 @input="Input_handle()"
 						 @keydown="add_gdzlent($event, '生产款号', '订单数量', '款式')" />
 					  </el-form-item>
 					  <el-form-item label="落货日期" label-width="100px">
@@ -507,6 +518,7 @@
 				  <div style="flex: 0.5; margin-right: 10px;">
 					<el-form-item label="船样合计" label-width="100px">
 					  <el-input v-model="add_gdscgdformData['船样合计']" id="船样合计"
+						@input="Input_handle()"
 						@keydown="add_gdzlent($event, '船样描述', '船样合计', '粘衬')"
 					  />
 					</el-form-item>
@@ -549,7 +561,7 @@
 						highlight-current-row="true"
 						style="width: 100%;height: 30vh" border tooltip-effect="dark" :data="zsglddtableData" row-key="ID">
 				  <el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
-				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="200"/>
+				  <el-table-column align="left" label="物料编码" prop="物料编码"  width="200"/>
 				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="200"/>
 				  <el-table-column align="left" label="颜色" prop="颜色"  width="115"/>
 				  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
@@ -620,6 +632,30 @@
 			</template>	
 		  </el-dialog>		
 		  
+		  
+		    <el-dialog
+		      v-model="order_viewVisible"
+		      title="选择打印格式"
+		      width="30%"
+		      top="25%"
+		      :before-close="order_viewCloseDialog"
+		      destroy-on-close
+		    >
+		      <el-form>
+		        <el-form-item label="打印方向" label-width="100px">
+		          <el-radio-group v-model="printDirection">
+		            <el-radio label="纵向">纵向</el-radio>
+		            <el-radio label="横向">横向</el-radio>
+		          </el-radio-group>
+		        </el-form-item>
+		      </el-form>
+		  
+		      <template #footer>
+		        <el-button @click="order_viewCloseDialog">关闭</el-button>
+		        <el-button type="primary" @click="confirmPrintDirection">确定打印</el-button>
+		      </template>
+		    </el-dialog>
+			
 		  <!-- 修改BOM资料 -->
 		  <el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="60%" top="2%" destroy-on-close>
 			  <el-descriptions class="margin-top" :column="4"  :size="size" border>
@@ -775,6 +811,7 @@
 					  </el-form-item>
 					  <el-form-item label="订单数量" label-width="100px">
 						<el-input v-model="edit_ddformData['订单数量']" id='订单数量'
+						  @input="Input_handle()"
 						  @keydown="add_gdzlent($event, '生产款号', '订单数量', '款式')"
 						/>
 					  </el-form-item>
@@ -898,6 +935,7 @@
 				<div style="flex:0.5; margin-right: 10px;">
 				  <el-form-item label="船样合计" label-width="100px">
 					<el-input v-model="edit_ddformData['船样合计']" id="船样合计"
+					  @input="Input_handle()"
 					  @keydown="add_gdzlent($event, '船样描述', '船样合计', '粘衬')"
 					/>
 				  </el-form-item>
@@ -971,7 +1009,7 @@
 		   <el-dialog
 			  v-model="add_gdyjdialogFormVisible"
 			  :before-close="add_gdyjcloseDialog"
-			  style="width: 66%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
+			  style="width: 73%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
 			  :title="'新增颜色资料'"
 			  destroy-on-close>
 			  <el-form label-width="100px" :model="add_yszlformdata">
@@ -1019,7 +1057,7 @@
 					</el-col>
 	  
 				  <el-col :span="8">
-					<el-form-item label="是否船样:" prop="joinDate" label-width='200'>
+					<el-form-item label="是否船样:" prop="joinDate" label-width='230'>
 					  <el-select v-model="add_yszlformdata.sfcy" style="width: 150px;" id ='是否船样'  @keydown="add_gdzlent($event, '颜色备注', '是否船样', 'cm1')">
 						<el-option label="是" value="是" @click="cyChange('是')"></el-option>
 						<el-option label="否" value="否" @click="cyChange('否')"></el-option>
@@ -1090,6 +1128,31 @@
 						style="width: 80px;"
 						@input="handleSizeInput('cm10')"
 						/>
+						<el-input
+						v-model="cmformdata.cm11"
+						style="width: 80px;"
+						@input="handleSizeInput('cm11')"
+						/>
+						<el-input
+						v-model="cmformdata.cm12"
+						style="width: 80px;"
+						@input="handleSizeInput('cm12')"
+						/>
+						<el-input
+						v-model="cmformdata.cm13"
+						style="width: 80px;"
+						@input="handleSizeInput('cm13')"
+						/>
+						<el-input
+						v-model="cmformdata.cm14"
+						style="width: 80px;"
+						@input="handleSizeInput('cm14')"
+						/>
+						<el-input
+						v-model="cmformdata.sctotal"
+						style="width: 80px;"
+						@input="handleSizeInput('sctotal')"
+						/>
 					</el-form-item>
 					</el-col>
   				</el-row>
@@ -1097,7 +1160,7 @@
 				<el-row :gutter="24" class="form-row">
 				  <el-col :span="24">
 					<el-form-item label="制单数:" class="mab" prop="keyOrder" label-width='110'>
-					  <el-input v-model="zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id ='zds1'  @keydown="add_gdzlent($event, 'cm9', 'zds1', 'zds2')"/>
+					  <el-input v-model="zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id ='zds1'  @keydown="add_gdzlent($event, 'cm14', 'zds1', 'zds2')"/>
 					  <el-input v-model="zdsformdata.zds2" @input="updateTotal" style="width: 80px;" id ='zds2'  @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')"/>
 					  <el-input v-model="zdsformdata.zds3" @input="updateTotal" style="width: 80px;" id ='zds3'  @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')"/>
 					  <el-input v-model="zdsformdata.zds4" @input="updateTotal" style="width: 80px;" id ='zds4'  @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')"/>
@@ -1105,8 +1168,13 @@
 					  <el-input v-model="zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id ='zds6'  @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')"/>
 					  <el-input v-model="zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id ='zds7'  @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')"/>
 					  <el-input v-model="zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id ='zds8'  @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')"/>
-					  <el-input v-model="zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id ='zds9'  @keydown="add_gdzlent($event, 'zds8', 'zds9', '色系名称')"/>
-					  <el-input v-model="zdsformdata.zds10" readonly style="width: 80px;" />
+					  <el-input v-model="zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id ='zds9'  @keydown="add_gdzlent($event, 'zds8', 'zds9', 'zds10')"/>
+					  <el-input v-model="zdsformdata.zds10" @input="updateTotal" style="width: 80px;" id ='zds10'  @keydown="add_gdzlent($event, 'zds9', 'zds10', 'zds11')"/>
+					  <el-input v-model="zdsformdata.zds11" @input="updateTotal" style="width: 80px;" id ='zds11'  @keydown="add_gdzlent($event, 'zds10', 'zds11', 'zds12')"/>
+					  <el-input v-model="zdsformdata.zds12" @input="updateTotal" style="width: 80px;" id ='zds12'  @keydown="add_gdzlent($event, 'zds11', 'zds12', 'zds13')"/>
+					  <el-input v-model="zdsformdata.zds13" @input="updateTotal" style="width: 80px;" id ='zds13'  @keydown="add_gdzlent($event, 'zds12', 'zds13', 'zds14')"/>
+					  <el-input v-model="zdsformdata.zds14" @input="updateTotal" style="width: 80px;" id ='zds14'  @keydown="add_gdzlent($event, 'zds13', 'zds14', '色系名称')"/>
+					  <el-input v-model="zdsformdata.zdtotal" readonly style="width: 80px;" />
 					</el-form-item>
 				  </el-col>
 				</el-row>
@@ -1627,7 +1695,12 @@
 	cm7:'',
 	cm8:'',
 	cm9:'',
-	cm10:'总计',
+	cm10:'',
+	cm11:'',
+	cm12:'',
+	cm13:'',
+	cm14:'',
+	sctotal:'总计',
   });
   //制单数
   const edit_zdsformdata = reactive({
@@ -1641,6 +1714,11 @@
 	zds8:'',
 	zds9:'',
 	zds10:'',
+	zds11:'',
+	zds12:'',
+	zds13:'',
+	zds14:'',
+	zdtotal:'',
   });
   const Uniqid = ref('')//颜色资料Uniqid
   
@@ -1679,7 +1757,7 @@
 		  edit_params[`cm${index}`] = size;  
 		  edit_params[`cmsl${index++}`] = quantity;  
 	  }  
-	  for (let i = 1; i <= 9; i++) {
+	  for (let i = 1; i <= 14; i++) {
 		  edit_cmformdata[`cm${i}`] = edit_params[`cm${i}`] || '';
 		  edit_zdsformdata[`zds${i}`] = (edit_params[`cmsl${i}`] === 0 || edit_params[`cmsl${i}`] === null) ? '' : edit_params[`cmsl${i}`];
 	  }
@@ -1690,11 +1768,11 @@
   //自动计算制单数总计
   function updateTotal() {  
 	// 直接指定要累加的属性名  
-	const relevantKeys = ['zds1', 'zds2', 'zds3', 'zds4', 'zds5', 'zds6', 'zds7', 'zds8', 'zds9'];  
+	const relevantKeys = ['zds1', 'zds2', 'zds3', 'zds4', 'zds5', 'zds6', 'zds7', 'zds8', 'zds9', 'zds10', 'zds11', 'zds12', 'zds13', 'zds14'];  
 	const values = relevantKeys.map(key => parseInt(zdsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-	zdsformdata.zds10 = values.reduce((sum, value) => sum + value, 0);  
+	zdsformdata.zdtotal = values.reduce((sum, value) => sum + value, 0);  
 	const valuess = relevantKeys.map(key => parseInt(edit_zdsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-	edit_zdsformdata.zds10 = valuess.reduce((sum, value) => sum + value, 0);  
+	edit_zdsformdata.zdtotal = valuess.reduce((sum, value) => sum + value, 0);  
   }  
   
   //点击是否船样 改变子订单编号
@@ -1710,9 +1788,20 @@
   
   //修改颜色资料确认
   const ys_edit_Dialog = async () => {
+	  
 	  if (!edit_formData.value) return;
-	  //颜色id
-	  // console.log(edit_formData.value.color_id)
+	  
+	  //获取颜色编号id
+	  const getPonumberdata = await getSuborder({colorname:edit_formData['颜色'],order:_ddhval.value,cy:edit_formData['船样']});
+	  // 从返回中提取 colorlist
+	  const colorlist = getPonumberdata.data.colorlist || [];
+	  // 获取匹配的颜色项
+	  const match = colorlist.find(item => item.colorname === edit_formData['颜色']);
+	  if (match) {
+	    edit_colorcode.value = match.colorcode;
+	  } else {
+	    console.warn('未找到匹配的颜色');
+	  }
 	  
 	  function buildSizeQuantitiesMap(sizes, formData) {  
 		  const sizeQuantitiesMap = {};  
@@ -1735,7 +1824,7 @@
 	  船样: edit_formData.船样 === '是' ? '1' : '0', // 转换船样字段  
 	  颜色: edit_formData.颜色,  
 	  color_id:edit_colorcode.value,
-	  zdtotal: edit_zdsformdata.zds10,  
+	  zdtotal: edit_zdsformdata.zdtotal,  
 	  Sys_id: edit_formData.value.Sys_id,  
 	  id: Uniqid.value,  
 	};  
@@ -1744,6 +1833,7 @@
 	   const cmslValue = +edit_zdsformdata[`zds${index}`]; // 获取对应的数量
 	   params[`cmsl${index++}`] = cmslValue === 0 ? "" : cmslValue; // 如果为0，赋值为空字符串 
 	}  
+	console.log(params)
 	//颜色资料修改接口
 	const PrintDataEdit_list = await PrintDataEdit(params);
 	if(PrintDataEdit_list.code === 0){
@@ -1851,17 +1941,6 @@
 	  add_gdscgdformData['客户编号'] = _Gd_khdh.value
 	  add_gdscgdformData['Sys_id'] = _username.value 
 	  add_gdscgdformData['制单日期'] = currentDates
-	  // add_gdscgdformData['生产款号'] = ''
-	  // add_gdscgdformData['款式'] = ''
-	  // add_gdscgdformData['落货日期'] = ''
-	  // add_gdscgdformData['面料'] = ''
-	  // add_gdscgdformData['备注'] = ''
-	  // add_gdscgdformData['船样描述'] = ''
-	  // add_gdscgdformData['船样合计'] = ''
-	  // add_gdscgdformData['箱唛要求'] = ''
-	  // add_gdscgdformData['粘衬'] = ''
-	  // add_gdscgdformData['订单数量'] = ''
-	  // add_gdscgdformData['合并'] = false
   }
   
   //操作移除按钮
@@ -2008,12 +2087,7 @@
   const ddsearchHandle = async (v) => {
 	  console.log(v)
 	  glddtableData.splice(0, glddtableData.length);//清空表格
-	  
-	  // //判断搜索条件为空
-	  // if(v === '' || v === null || v === undefined){
-	  // 	return
-	  // }
-	  
+
 	  //搜索面料库存数据列表接口
 	  const response = await fabricList({order:v});
 	if (response.data && response.data.length === 0) {
@@ -2090,7 +2164,12 @@
 	cm7:'44',
 	cm8:'46',
 	cm9:'48',
-	cm10:'总计',
+	cm10:'',
+	cm11:'',
+	cm12:'',
+	cm13:'',
+	cm14:'',
+	sctotal:'总计',
   });
   const zdsformdata = reactive({
 	zds1:'',
@@ -2103,6 +2182,11 @@
 	zds8:'',
 	zds9:'',
 	zds10:'',
+	zds11:'',
+	zds12:'',
+	zds13:'',
+	zds14:'',
+	zdtotal:'',
   });
   //记录色系编号
   const add_colorcode = ref('')
@@ -2245,14 +2329,17 @@
 		cmformdata.cm7 = getSuborders.data.cm.cm7 || '';
 		cmformdata.cm8 = getSuborders.data.cm.cm8 || '';
 		cmformdata.cm9 = getSuborders.data.cm.cm9 || '';
-		cmformdata.cm10 = '合计';
+		cmformdata.cm10 = getSuborders.data.cm.cm10 || '';
+		cmformdata.cm11 = getSuborders.data.cm.cm11 || '';
+		cmformdata.cm12 = getSuborders.data.cm.cm12 || '';
+		cmformdata.cm13 = getSuborders.data.cm.cm13 || '';
+		cmformdata.cm14 = getSuborders.data.cm.cm14 || '';
+		cmformdata.sctotal = '合计';
 	  }
   
 	  add_yszlformdata['ddh'] = _Gd_gdbh.value;
 	  add_yszlformdata['ys'] = '';
 	  add_yszlformdata['kh'] = '';
-	  // add_yszlformdata['sxmc'] = '';
-	  // add_yszlformdata['cmgg'] = '32~46';
 	  add_yszlformdata['sfcy'] = '否';
 	  add_yszlformdata['颜色备注'] = '否';
 	  add_yszlformdata['kdy'] = _username.value;
@@ -2281,6 +2368,14 @@ function handleSizeInput(field) {
 }
 
 
+function Input_handle() {
+  add_gdscgdformData['订单数量'] = add_gdscgdformData['订单数量'].replace(/[^\d]/g, '')
+  add_gdscgdformData['船样合计'] = add_gdscgdformData['船样合计'].replace(/[^\d]/g, '')
+  
+  edit_ddformData['订单数量'] = edit_ddformData['订单数量'].replace(/[^\d]/g, '')
+  edit_ddformData['船样合计'] = edit_ddformData['船样合计'].replace(/[^\d]/g, '')
+}
+
 
   //新增颜色资料确定
   const add_gdyjenterDialog =  async  () => {
@@ -2305,6 +2400,19 @@ function handleSizeInput(field) {
 		  cy = '0'
 	  }
 	  
+	  
+	  //获取颜色编号id
+	  const getPonumberdata = await getSuborder({colorname:add_yszlformdata['sxmc'],order:_ddhval.value,cy:add_yszlformdata['sfcy']});
+	  // 从返回中提取 colorlist
+	  const colorlist = getPonumberdata.data.colorlist || [];
+	  // 获取匹配的颜色项
+	  const match = colorlist.find(item => item.colorname === add_yszlformdata['sxmc']);
+	  if (match) {
+	  		add_colorcode.value = match.colorcode;
+	  } else {
+	  		console.warn('未找到匹配的颜色');
+	  }
+	  
 	const addyszltable = {
 	  订单编号: add_yszlformdata['ddh'],
 	  子订单编号: add_yszlformdata['ddzbh'],
@@ -2324,6 +2432,12 @@ function handleSizeInput(field) {
 	  cm7: cmformdata['cm7'],
 	  cm8: cmformdata['cm8'],
 	  cm9: cmformdata['cm9'],
+	  cm10: cmformdata['cm10'],
+	  cm11: cmformdata['cm11'],
+	  cm12: cmformdata['cm12'],
+	  cm13: cmformdata['cm13'],
+	  cm14: cmformdata['cm14'],
+	  sctotal: cmformdata['sctotal'],
 	  //尺码数量
 	  cmsl1: zdsformdata['zds1'],
 	  cmsl2: zdsformdata['zds2'],
@@ -2334,7 +2448,12 @@ function handleSizeInput(field) {
 	  cmsl7: zdsformdata['zds7'],
 	  cmsl8: zdsformdata['zds8'],
 	  cmsl9: zdsformdata['zds9'],
-	  zdtotal: zdsformdata['zds10'],
+	  cmsl10: zdsformdata['zds10'],
+	  cmsl11: zdsformdata['zds11'],
+	  cmsl12: zdsformdata['zds12'],
+	  cmsl13: zdsformdata['zds13'],
+	  cmsl14: zdsformdata['zds14'],
+	  zdtotal: zdsformdata['zdtotal'],
 	  };
 	  console.log(addyszltable)
 	  // return;
@@ -2457,20 +2576,34 @@ function handleSizeInput(field) {
   
   
   // =========== 订单打印 ===========
+  //弹窗
+  const order_viewVisible = ref(false)
+  // 默认选择竖向
+  const printDirection = ref('纵向')
   const cp_gdprintonClick = () => {
+	  order_viewVisible.value = true
+  }
+  
+  //确定打印
+  const confirmPrintDirection = () => {
+	 
 	  console.log(_Gd_gdbh.value)
-	  
-	if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
-	  ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
-	  return false;
-	}else{
-	  if(ystableData.length >=1){
-		printPageRef.value.open(_Gd_gdbh.value) 
+	  console.log(printDirection.value)
+	    
+	  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
+	    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
+	    return false;
 	  }else{
-		ElMessage({type: 'warning',message: '请新增颜色资料，再操作此功能'})
-		return false;
+	    if(ystableData.length >=1){
+	  	printPageRef.value.open(_Gd_gdbh.value,printDirection.value) 
+	    }else{
+	  	ElMessage({type: 'warning',message: '请新增颜色资料，再操作此功能'})
+	  	return false;
+	    }
 	  }
-	}
+  }
+  const order_viewCloseDialog = () => {
+	  order_viewVisible.value = false
   }
   
   // =========== BOM资料 ===========
@@ -3044,32 +3177,36 @@ function handleSizeInput(field) {
 	}
   }
   
-  // ===========删除颜色资料、工艺资料 ===========
-  const delgd_delclick = async () => {
-	if (ysSelection.value !== '') {
-	  try {
-		const res1 = await PrintDetailDel({UniqId: ysSelection.value})
-		res1.code === 0 && ElMessage.success('颜色资料删除成功')
-	  } catch(err) {
-		ElMessage.error(err)
-	  }
-	}
-	if (gySelection.value !== ''){
-	  try {
-		const res2 = await PrintDetailDel({UniqId: gySelection.value})
-		if(res2.code === 0){
-		  ElMessage.success('工艺资料删除成功')
-		  const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
-		  sizeDatas.splice(0,PrintListDatas.data.型号.length,...PrintListDatas.data.型号);
-		  ystableData.splice(0,PrintListDatas.data.列表.length,...PrintListDatas.data.列表);
-		}else{
-		  console.log('?')
-		}
-	  } catch(err) {
-		ElMessage.error(err)
-	  }
-	} 
-  }
+	// ===========删除颜色资料、工艺资料 ===========
+	const delgd_delclick = async () => {
+		let changed = false;
+
+		try {
+			if (ysSelection.value !== '') {
+			  const res1 = await PrintDetailDel({ UniqId: ysSelection.value });
+			  if (res1.code === 0) {
+				ElMessage.success('颜色资料删除成功');
+				changed = true;
+			  }
+			}
+
+			if (gySelection.value !== '') {
+			  const res2 = await PrintDetailDel({ UniqId: gySelection.value });
+			  if (res2.code === 0) {
+				ElMessage.success('工艺资料删除成功');
+				changed = true;
+			  }
+			}
+
+			if (changed) {
+			  const PrintListDatas = await PrintListData({ order: _Gd_gdbh.value });
+			  sizeDatas.splice(0, sizeDatas.length, ...PrintListDatas.data.型号);
+			  ystableData.splice(0, ystableData.length, ...PrintListDatas.data.列表);
+			}
+		} catch (err) {
+			ElMessage.error(err);
+		}
+	};
   
   const fj_Selection = ref('')//存储选中Uniqid
   const fjSelection = ref('')

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -55,7 +55,7 @@
 						<el-table-column   align="left" label="订单数量" prop="订单数量"  width="90" />
 						<el-table-column   align="left" label="包装完工数量" prop="工单完工数量"  width="110" />
 						<el-table-column   align="left" label="完工日期" prop="工单完工日期"  width="140" />
-						<el-table-column   align="left" label="单位" prop="单位"  width="60" />
+						<el-table-column   align="left" label="单位" prop="单位"  width="55" />
 						<el-table-column   align="left" label="面料" prop="面料"  width="360" />
 						<el-table-column   align="left" label="粘衬" prop="粘衬"  width="360" />
 						<el-table-column   align="left" label="要求" prop="要求"  width="360" />
@@ -66,7 +66,7 @@
 						<el-table-column   align="left" label="制单日期" prop="Sys_rq"  width="160" />
 						<!-- <el-table-column   align="left" label="接单日期" prop="接单日期"  width="120" /> -->
 						<el-table-column   align="left" label="出库日期" prop="出库日期"  width="160" />
-						<el-table-column   align="left" label="落货日期" prop="落货日期"  width="160" />
+						<el-table-column   align="left" label="落货日期" prop="落货日期"  width="100" />
 						<el-table-column   align="left" label="审核" prop="审核"  width="100" />
 						<el-table-column   align="left" label="审核日期" prop="审核日期"  width="160" />
 						<!-- <el-table-column   align="left" label="更新时间" prop="Mod_rq"  width="160" /> -->