zck 1 gadu atpakaļ
vecāks
revīzija
1e1999f7e1

+ 12 - 3
src/api/mes/job.js

@@ -87,11 +87,11 @@ export const printDetailAdd = (data) => {
   })
 }
 //订单资料删除
-export const orderDataDel = (data) => {
+export const orderDataDel = (params) => {
   return service({
     url: '/mes_server/work_order/orderDataDel',
-    method: 'post',
-    data
+    method: 'get',
+    params
   })
 }
 //颜色资料删除
@@ -102,6 +102,15 @@ export const PrintDetailDel = (params) => {
     params
   })
 }
+
+//订单打印
+export const orderPrint = (params) => {
+  return service({
+    url: '/mes_server/work_order/orderPrint',
+    method: 'get',
+    params
+  })
+}
 //获取报工历史记录
 export const getTab = (params) => {
   return service({

+ 26 - 7
src/view/performance/baozhuangbaogong.vue

@@ -14,16 +14,16 @@
 					<el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>	
 					
 					<el-form-item label="机台号:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="add_formData['机台号']" style="width: 110px;height: 40px;" id="机台号" />
+						<el-input v-model="add_formData['机台号']" readonly  style="width: 100px;height: 40px;" id="机台号" />
 					</el-form-item>
 					<el-form-item label="工序:" prop="deliveryDate" class="mab"style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['工序']" style="width: 110px;height: 40px;" id="工序" />
+						<el-input v-model="add_formData['工序']"  readonly  style="width: 150px;height: 40px;" id="工序" />
 					</el-form-item>
 					<el-form-item label="组别:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['组别']" style="width: 110px;height: 40px;" id="组别" />
+						<el-input v-model="add_formData['组别']" readonly  style="width: 150px;height: 40px;" id="组别" />
 					</el-form-item>
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
+						<el-input v-model="add_formData['人员']" readonly  style="width: 170px;height: 40px;" id="人员" />
 					</el-form-item>
 
 				</el-row>
@@ -62,8 +62,8 @@
 							 ref="multipleTableRef"
 							 style="width: 100%;height: 53vh"
 							 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' }"
+							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '30px' }"
+							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '30px' }"
 							 :data="add_tableData" border row-key="ID" size="small"
 							 highlight-current-row="true"
 							 @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
@@ -73,7 +73,7 @@
 						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
 						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
 						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色" prop="颜色" width="140"/>
+						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
 						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
 						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
 						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
@@ -171,6 +171,25 @@ const getMachineMacdata = async () => {
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
 	add_formData['人员'] = data.data['组长']
+	document.getElementById('searchInput').style.fontSize = '28px'
+	document.getElementById('searchInput').style.color = 'red'
+
+	
+	document.getElementById('机台号').style.fontSize = '28px'
+	document.getElementById('工序').style.fontSize = '28px'
+	document.getElementById('组别').style.fontSize = '28px'
+	document.getElementById('人员').style.fontSize = '28px'
+	document.getElementById('数量').style.fontSize = '28px'
+	document.getElementById('尺码').style.fontSize = '28px'
+
+	document.getElementById('机台号').style.color = 'red'
+	document.getElementById('工序').style.color = 'red'
+	document.getElementById('组别').style.color = 'red'
+	document.getElementById('人员').style.color = 'red'
+	document.getElementById('数量').style.color = 'red'
+	document.getElementById('尺码').style.color = 'red'
+
+
   } catch (error) {
     console.error(error)
   }

+ 2 - 1
src/view/performance/caiqiebaogong.vue

@@ -88,7 +88,7 @@
               <el-table-column  sortable align="left" label="订单子编号" prop="子订单编号"  width="130"/>
               <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="120" />
               <el-table-column  sortable  align="left" label="款式" prop="款式" width="110" />
-              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="80"  />
+              <el-table-column  sortable  align="left" label="色系名称" prop="颜色" width="110"  />
               <el-table-column  sortable  align="left" label="制单总数" prop="zdtotal" width="110" />
               <el-table-column  sortable  align="left" label="实裁总数" prop="sctotal" width="110" />
               <el-table-column  sortable  align="left" label="单位" prop="单位" width="80" />
@@ -279,6 +279,7 @@ function updateTotal() {
   const values = relevantKeys.map(key => parseInt(scsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
   scsformdata.sctotal = values.reduce((sum, value) => sum + value, 0);  
 }  
+
 const add_tableData = ref([]);
 const _order = ref('');
 const _UniqId = ref('');

+ 39 - 16
src/view/performance/chafengbaogong.vue

@@ -33,22 +33,38 @@
 						</el-form-item>
 				</el-row>
 				<el-row :gutter="24">
-					<el-form-item label="尺码" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm3" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm4" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm5" disabled style="width: 90px;height: 40px;"/>	
-						<el-input v-model="cmformdata.cm6" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm7" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm8" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>	
-						<el-input v-model="cmformdata.cm10" disabled style="width: 90px;height: 40px;"/>
-						<el-input v-model="cmformdata.cm11" disabled style="width: 90px;height: 40px;"/>
+					<el-form-item label="尺码" class="mab" prop="keyOrder" label-width="160" style="font-size: 30px;margin:10px 0 0 0 ;">
+						<el-input v-model="cmformdata.cm1" class="cm_input"  disabled style="width: 90px;height: 40px;"/>
+
+						<el-input v-model="cmformdata.cm2" class="large-input" disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm3" class="large-input" disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm4" class="large-input"  disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm5" class="large-input"  disabled style="width: 90px;height: 40px;"/>	
+						<el-input v-model="cmformdata.cm6" class="large-input"  disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm7" class="large-input"  disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm8" class="large-input"  disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm9" class="large-input"  disabled style="width: 90px;height: 40px;"/>	
+						<el-input v-model="cmformdata.cm10" class="large-input"  disabled style="width: 90px;height: 40px;"/>
+						<el-input v-model="cmformdata.cm11" class="large-input"  disabled style="width: 90px;height: 40px;"/>
 					</el-form-item>
 				</el-row>
 		      <el-row :gutter="24">
-		          <el-form-item label="制单数/实裁量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
+		          <el-form-item label="制单数" class="mab" prop="keyOrder" label-width="160" style="font-size: 30px;margin-top: -5px;">
+		              <el-input v-model="zdscformdata.zdsc1" disabled style="width: 90px;height: 40px;" id="zdsc1"/>
+		              <el-input v-model="zdscformdata.zdsc2" disabled style="width: 90px;height: 40px;" id="zdsc2"/>
+		              <el-input v-model="zdscformdata.zdsc3" disabled style="width: 90px;height: 40px;" id="zdsc3"/>
+		              <el-input v-model="zdscformdata.zdsc4" disabled style="width: 90px;height: 40px;" id="zdsc4"/>
+		              <el-input v-model="zdscformdata.zdsc5" disabled style="width: 90px;height: 40px;" id="zdsc5"/>
+		              <el-input v-model="zdscformdata.zdsc6" disabled style="width: 90px;height: 40px;" id="zdsc6"/>
+		              <el-input v-model="zdscformdata.zdsc7" disabled style="width: 90px;height: 40px;" id="zdsc7"/>
+		              <el-input v-model="zdscformdata.zdsc8" disabled style="width: 90px;height: 40px;" id="zdsc8"/>
+		              <el-input v-model="zdscformdata.zdsc9" disabled style="width: 90px;height: 40px;" id="zdsc9"/>
+					  <el-input v-model="zdscformdata.zdsc10" disabled style="width: 90px;height: 40px;" id="zdsc10"/>
+					  <el-input v-model="zdscformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zdsc11"/>
+		          </el-form-item>
+		      </el-row>
+			  <el-row :gutter="24">
+		          <el-form-item label="实裁量" class="mab" prop="keyOrder" label-width="160" style="font-size: 30px;margin-top: -10px;">
 		              <el-input v-model="zdscformdata.zdsc1" disabled style="width: 90px;height: 40px;" id="zdsc1"/>
 		              <el-input v-model="zdscformdata.zdsc2" disabled style="width: 90px;height: 40px;" id="zdsc2"/>
 		              <el-input v-model="zdscformdata.zdsc3" disabled style="width: 90px;height: 40px;" id="zdsc3"/>
@@ -63,7 +79,7 @@
 		          </el-form-item>
 		      </el-row>
 		      <el-row :gutter="24">
-		          <el-form-item label="数量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
+		          <el-form-item label="数量" class="mab" prop="keyOrder" label-width="160" style="font-size: 30px;margin-top: -10px;">
 		              <el-input  v-model="slformdata.sl1" @input="updateTotal" style="width: 90px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
 		              <el-input  v-model="slformdata.sl2" @input="updateTotal" style="width: 90px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
 		              <el-input  v-model="slformdata.sl3" @input="updateTotal" style="width: 90px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
@@ -94,7 +110,7 @@
 						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
 						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
 						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色" prop="颜色" width="140"/>
+						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
 						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
 						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
 						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
@@ -800,7 +816,9 @@ const confirmDialogVisible = () => {
   .el-table .warning-row {
 	background: oldlace;
   }
-  
+  :deep(.el-input .is-disabled .cm_input){
+	color: #ff0000;
+  }
   /* 选中某行时的背景色 */
   :deep(.el-table__body tr.current-row) > td {
 	background: #ff80ff !important;
@@ -838,5 +856,10 @@ const confirmDialogVisible = () => {
   .default-button {  
 	  background-color: #808080;
   }
+  ::v-deep .el-input_inner {  
+  font-size: 20px; /* 更改为你想要的字体大小 */  
+}  
+
+
   </style>
   

+ 1 - 1
src/view/performance/chukubaogong.vue

@@ -28,7 +28,7 @@
               <el-table-column  sortable  align="left" label="订单子编号" prop="子订单编号" width="200"/>
               <el-table-column  sortable  align="left" label="生产款号" prop="款号" width="200"/>
               <el-table-column  sortable  align="left" label="款式" prop="款式" width="200"/>
-              <el-table-column  sortable  align="left" label="色" prop="颜色" width="200"/>
+              <el-table-column  sortable  align="left" label="色系名称" prop="颜色" width="200"/>
 			  <el-table-column  sortable  align="left" label="是否出库" prop="是否出库" width="200"/>
             </el-table>
             <div class="dialog-footer" style="text-align: left;margin-right: 60px;">

+ 5 - 5
src/view/performance/datangbaogong.vue

@@ -14,16 +14,16 @@
 					<el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>	
 					
 					<el-form-item label="机台号:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="add_formData['机台号']" style="width: 110px;height: 40px;" id="机台号" />
+						<el-input v-model="add_formData['机台号']" disabled  style="width: 110px;height: 40px;" id="机台号" />
 					</el-form-item>
 					<el-form-item label="工序:" prop="deliveryDate" class="mab"style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['工序']" style="width: 110px;height: 40px;" id="工序" />
+						<el-input v-model="add_formData['工序']" disabled  style="width: 110px;height: 40px;" id="工序" />
 					</el-form-item>
 					<el-form-item label="组别:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['组别']" style="width: 110px;height: 40px;" id="组别" />
+						<el-input v-model="add_formData['组别']" disabled  style="width: 110px;height: 40px;" id="组别" />
 					</el-form-item>
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
+						<el-input v-model="add_formData['人员']" disabled  style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
 
 				</el-row>
@@ -73,7 +73,7 @@
 						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
 						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
 						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色" prop="颜色" width="140"/>
+						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
 						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
 						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
 						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>

+ 19 - 19
src/view/performance/houdaoshougong.vue

@@ -14,16 +14,16 @@
 					<el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>	
 					
 					<el-form-item label="机台号:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="add_formData['机台号']" style="width: 110px;height: 40px;" id="机台号" />
+						<el-input v-model="add_formData['机台号']" disabled style="width: 110px;height: 40px;" id="机台号" />
 					</el-form-item>
 					<el-form-item label="工序:" prop="deliveryDate" class="mab"style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['工序']" style="width: 110px;height: 40px;" id="工序" />
+						<el-input v-model="add_formData['工序']" disabled  style="width: 110px;height: 40px;" id="工序" />
 					</el-form-item>
 					<el-form-item label="组别:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['组别']" style="width: 110px;height: 40px;" id="组别" />
+						<el-input v-model="add_formData['组别']" disabled  style="width: 110px;height: 40px;" id="组别" />
 					</el-form-item>
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
+						<el-input v-model="add_formData['人员']" disabled  style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
 
 				</el-row>
@@ -37,20 +37,20 @@
 					</el-form-item>
 					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
-					<div  
-						:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"  
-						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
-						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"  
-					>  
-  
-					</div>  
-					<div  
-						:class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"  
-						style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
-						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"  
-					>  
-  
-					</div>  
+					<div    
+    :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
+    style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000; font-size: 24px;"    
+    :style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"    
+>    
+  
+</div>    
+<div    
+    :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
+    style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000; font-size: 32px;"    
+    :style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"    
+>    
+  
+</div>
 					</el-form-item>  
 				</el-row>  
 					
@@ -73,7 +73,7 @@
 						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
 						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
 						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色" prop="颜色" width="140"/>
+						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
 						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
 						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
 						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>

+ 5 - 5
src/view/performance/zongjianbaogong.vue

@@ -14,16 +14,16 @@
 					<el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>	
 					
 					<el-form-item label="机台号:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="add_formData['机台号']" style="width: 110px;height: 40px;" id="机台号" />
+						<el-input v-model="add_formData['机台号']" disabled  style="width: 110px;height: 40px;" id="机台号" />
 					</el-form-item>
 					<el-form-item label="工序:" prop="deliveryDate" class="mab"style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['工序']" style="width: 110px;height: 40px;" id="工序" />
+						<el-input v-model="add_formData['工序']" disabled  style="width: 110px;height: 40px;" id="工序" />
 					</el-form-item>
 					<el-form-item label="组别:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['组别']" style="width: 110px;height: 40px;" id="组别" />
+						<el-input v-model="add_formData['组别']" disabled  style="width: 110px;height: 40px;" id="组别" />
 					</el-form-item>
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
+						<el-input v-model="add_formData['人员']" disabled  style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
 
 				</el-row>
@@ -73,7 +73,7 @@
 						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
 						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
 						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色" prop="颜色" width="140"/>
+						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
 						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
 						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
 						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 36
src/view/yunyin/shengchanguanli/components/print.vue


+ 369 - 96
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -9,7 +9,7 @@
               <el-input v-model="searchInfo"  placeholder="搜索订单号" style="width: 180px;" @keyup.enter="handleSearch"></el-input>
               <el-button type="primary" icon="search" @click="onSubmit" title="搜索"  ></el-button>
               <el-button type="primary" class="bt" icon="edit"  @click="jsfjClick">技术附件</el-button>
-              <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt"   title="新增工单资料">新增</el-button>
+              <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt"   title="新增工单资料">新增订单资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增颜色资料">新增颜色资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工序资料" >新增工序资料</el-button>
               <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产订单" >订单打印</el-button>
@@ -25,7 +25,7 @@
         <!-- 左侧树形结构 -->
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
-            <h3>工单管理</h3>
+            <h3>客户编号</h3>
             <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
@@ -51,10 +51,10 @@
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
                 <el-table-column align="center" type="selection" width="30"/>
-                <el-table-column align="left" sortable label="序号"      	prop="序号"  	width="80" />
+                <!-- <el-table-column align="left" sortable label="序号"      	prop="序号"  	width="80" /> -->
                 <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="110" />
                 <el-table-column align="left" sortable label="生产款号"   	prop="生产款号"  width="110" />
-                <el-table-column align="left" sortable label="客户"      	prop="客户" 		width="80" />
+                <el-table-column align="left" sortable label="客户"      	prop="客户编号" 		width="80" />
                 <el-table-column align="left" sortable label="落货日期"   	prop="落货日期" 	width="110" />
                 <el-table-column align="left" sortable label="款式"       	prop="款式"   	width="80"/>
                 <el-table-column align="left" sortable label="箱唛要求"   	prop="箱唛要求" 	width="110" />
@@ -263,79 +263,80 @@
 				</template>
 			</el-dialog>
 			
-			<!-- 新增工单资料 -->
-            <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"  style="width: 35%;margin: 50px auto" :title="'新增'" destroy-on-close>
+			<!-- 新增订单资料弹窗 -->
+            <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"  style="width: 40%; height: 60%;margin-top: 4%" :title="'新增订单资料'" destroy-on-close>
               <el-row>
                 <el-form :model="add_gdscgdformData" label-position="right" ref="elFormRef" :rules="rule" > 
-                  <el-row :gutter="24" >
-                    <el-form-item label="订单号:" prop="customerCode" class="mab" label-width="90" >
-                      <el-input v-model="add_gdscgdformData['订单号']"  style="width: 150px;" id="订单号"  @keydown="add_gdzlent($event, '审核日期', '订单号', '订单编号')" />
-                    </el-form-item>
-                    <el-form-item label="订单编号:" prop="customerCode" class="mab" label-width="90">
+                  <el-row :gutter="24">
+                    <el-form-item label="订单编号:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['订单编号']"  style="width: 150px;" id="订单编号"  @keydown="add_gdzlent($event, '订单号', '订单编号', '生产款号')" />
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="生产款号:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="生产款号:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['生产款号']" style="width: 150px;" id="生产款号"  @keydown="add_gdzlent($event, '订单编号', '生产款号', '款式')"/>
                     </el-form-item>
-                    <el-form-item label="款式:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="款式:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['款式']" style="width: 150px;" id="款式"  @keydown="add_gdzlent($event, '生产款号', '款式', '客户编号')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="客户:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="客户:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['客户编号']" style="width: 150px;" id="客户编号"  @keydown="add_gdzlent($event, '款式', '客户编号', '落货日期')"/>
                     </el-form-item>
-                    <el-form-item label="落货日期:" prop="deliveryDate" class="mab" label-width="90">
+                    <el-form-item label="落货日期:" prop="deliveryDate" class="mab" label-width="110">
                       <el-date-picker v-model="add_gdscgdformData['落货日期']" type="date"  style="width: 150px;"  id="落货日期"  @keydown="add_gdzlent($event, '客户编号', '落货日期', '面料')"/>
                     </el-form-item>
                   </el-row>
-                  <el-row :gutter="24">
-                    <el-form-item label="面料:" prop="customerCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['面料']"  style="width: 150px;" id="面料"  @keydown="add_gdzlent($event, '落货日期', '面料', '要求')"/>
-                      <el-form-item label="要求:" prop="customerCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['要求']" p style="width: 150px;" id="要求"  @keydown="add_gdzlent($event, '面料', '要求', '船样描述')"/>
-                    </el-form-item>
-                    </el-form-item>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="面料:" prop="customerCode" class="mab" label-width="98">
+                        <el-input type="textarea" v-model="add_gdscgdformData['面料']" rows="2" resize="none" id="面料"   @keydown="add_gdzlent($event, '落货日期', '面料', '要求')" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="要求:" prop="customerCode" class="mab" label-width="98">
+                        <el-input type="textarea" v-model="add_gdscgdformData['要求']" rows="2" resize="none" id="要求"  @keydown="add_gdzlent($event, '面料', '要求', '船样描述')" />
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="船样描述:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="船样描述:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['船样描述']"  style="width: 150px;" id="船样描述"  @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')"/>
                     </el-form-item>
-                    <el-form-item label="船样合计:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="船样合计:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['船样合计']"  style="width: 150px;" id="船样合计"  @keydown="add_gdzlent($event, '船样描述', '船样合计', '箱唛要求')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="箱唛要求:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="箱唛要求:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['箱唛要求']" style="width: 150px;" id="箱唛要求"  @keydown="add_gdzlent($event, '船样合计', '箱唛要求', '粘衬')"/>
                     </el-form-item>
-                    <el-form-item label="粘衬:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="粘衬:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['粘衬']"  style="width: 150px;" id="粘衬"  @keydown="add_gdzlent($event, '箱唛要求', '粘衬', '订单数量')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="订单数量:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="订单数量:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['订单数量']"  style="width: 150px;" id="订单数量"  @keydown="add_gdzlent($event, '粘衬', '订单数量', '单位')"/>
                     </el-form-item>
-                    <el-form-item label="单位:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="单位:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['单位']"  style="width: 150px;" id="单位"  @keydown="add_gdzlent($event, '订单数量', '单位', '制单人')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="制单人:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="制单人:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['制单人']"  style="width: 150px;" id="制单人"  @keydown="add_gdzlent($event, '单位', '制单人', '制单日期')"/>
                     </el-form-item>
-                    <el-form-item label="制单日期:" prop="deliveryDate" class="mab" label-width="90">
+                    <el-form-item label="制单日期:" prop="deliveryDate" class="mab" label-width="110">
                       <el-date-picker v-model="add_gdscgdformData['制单日期']" type="date"  style="width: 150px;"  id="制单日期"  @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
-                    <el-form-item label="审核人:" prop="customerCode" class="mab" label-width="90">
+                    <el-form-item label="审核人:" prop="customerCode" class="mab" label-width="110">
                       <el-input v-model="add_gdscgdformData['审核人']" style="width: 150px;" id="审核人"  @keydown="add_gdzlent($event, '制单日期', '审核人', '审核日期')"/>
                     </el-form-item>
-                    <el-form-item label="审核日期:" prop="deliveryDate" class="mab" label-width="90">
+                    <el-form-item label="审核日期:" prop="deliveryDate" class="mab" label-width="110">
                       <el-date-picker v-model="add_gdscgdformData['审核日期']" type="date"  style="width: 150px;"  id="审核日期"  @keydown="add_gdzlent($event, '审核人', '审核日期', '订单号')"/>
                     </el-form-item>
                   </el-row>
@@ -355,16 +356,31 @@
                   <div style="display: flex; gap: 0px;">
                     <h3 style="color:red;font-size: 24px;margin:-5px 0px 8px 12px;">订单号&nbsp;&nbsp;&nbsp;{{_ddhval}}</h3>
                   </div>
+
                   <div style="display: flex; gap: 0px;">
-                    <el-form-item label="订单子编号:" class="mab" prop="keyOrder">
+                    <el-form-item label="订单子编号:" class="mab" prop="keyOrder" label-width='130'>
                       <el-input v-model="add_yszlformdata.ddzbh" style="width: 150px;" id="订单子编号" @keydown="add_gdzlent($event, 'zds9', '订单子编号', '颜色')"/>
                     </el-form-item>
-                    <el-form-item label="颜色:" class="mab" prop="keyOrder">
-                      <el-input v-model="add_yszlformdata.ys" style="width: 150px;" id="颜色" @keydown="add_gdzlent($event, '订单子编号', '颜色', '开单员')"/>
+                  </div>
+
+                  <div style="display: flex; gap: 0px;">
+                    <el-form-item label="色系名称:" class="mab"  prop="keyOrder"label-width='130'>
+                      <el-select v-model="add_yszlformdata.sxmc" style="width: 150px;" id="尺码规格" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
+                        <el-option label="红色" @click="sxhandleSizeChange('红色')" ></el-option>
+                        <el-option label="黄色" @click="sxhandleSizeChange('黄色')" ></el-option>
+                        <el-option label="蓝色" @click="sxhandleSizeChange('蓝色')" ></el-option>
+                        <el-option label="绿色" @click="sxhandleSizeChange('绿色')" ></el-option>
+                        <el-option label="紫色" @click="sxhandleSizeChange('紫色')" ></el-option>
+                        <el-option label="灰色" @click="sxhandleSizeChange('灰色')" ></el-option>
+                        <el-option label="咖啡" @click="sxhandleSizeChange('咖啡')" ></el-option>
+                        <el-option label="黑白" @click="sxhandleSizeChange('黑白')" ></el-option>
+                        <el-option label="经典色" @click="sxhandleSizeChange('经典色')" ></el-option>
+                      </el-select>
                     </el-form-item>
                   </div>
+                  
                   <div style="display: flex; gap: 0px;">
-                    <el-form-item label="开单员:" class="mab" prop="keyOrder">
+                    <el-form-item label="开单员:" class="mab" prop="keyOrder"label-width='130'>
                       <el-input v-model="add_yszlformdata.kdy" style="width: 150px;" id="开单员" @keydown="add_gdzlent($event, '颜色', '开单员', '款号')"/>
                     </el-form-item>
                     <el-form-item label="款号:" class="mab" prop="keyOrder">
@@ -372,13 +388,13 @@
                     </el-form-item>
                   </div>
                   <div style="display: flex; gap: 0px;">
-                    <el-form-item label="尺码规格:" prop="joinDate" >
+                    <el-form-item label="尺码规格:" prop="joinDate"label-width='130' >
                       <el-select v-model="add_yszlformdata.cmgg" style="width: 150px;" id="尺码规格" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
                         <el-option label="32~46"  @click="cmhandleSizeChange('尺码数')"></el-option>
                         <el-option label="S~XXL"  @click="cmhandleSizeChange('尺码')"></el-option>
                       </el-select>
                     </el-form-item>
-                    <el-form-item label="是否船样:" prop="joinDate" >
+                    <el-form-item label="是否船样:" prop="joinDate"label-width='130' >
                       <el-select v-model="add_yszlformdata.sfcy" style="width: 150px;" id="是否船样" @keydown="add_gdzlent($event, '尺码规格', '是否船样', 'zds1')">
                         <el-option label="是" value="是"></el-option>
                         <el-option label="否" value="否"></el-option>
@@ -386,7 +402,7 @@
                     </el-form-item>
                   </div>
                   <div style="display: flex; gap: 0px;">
-                    <el-form-item label="尺码:" class="mab" prop="keyOrder">
+                    <el-form-item label="尺码:" class="mab" prop="keyOrder"label-width='130'>
                       <el-input v-model="cmformdata.cm1" readonly style="width: 80px;"/>
                       <el-input v-model="cmformdata.cm2" readonly style="width: 80px;"/>
                       <el-input v-model="cmformdata.cm3" readonly style="width: 80px;"/>
@@ -399,7 +415,7 @@
                     </el-form-item>
                   </div>
                   <div style="display: flex; gap: 0px;">
-                    <el-form-item label="制单数:" class="mab" prop="keyOrder">
+                    <el-form-item label="制单数:" class="mab" prop="keyOrder"label-width='130'>
                       <el-input v-model="zdsformdata.zds1" style="width: 80px;" id="zds1" @keydown="add_gdzlent($event, '是否船样', 'zds1', 'zds2')"/>
                       <el-input v-model="zdsformdata.zds2" style="width: 80px;" id="zds2" @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')"/>
                       <el-input v-model="zdsformdata.zds3" style="width: 80px;" id="zds3" @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')"/>
@@ -412,7 +428,54 @@
                     </el-form-item>
                   </div>
                   <!-- 图片 --> 
-                  <div style="display: flex; gap: 0px;">
+                    <div class="uploadImage">
+                      <el-upload
+                        :file-list="fileList"
+                        accept="image/*"
+                        action=""
+                        ref="uploadBtn"
+                        drag
+                        multiple
+                        list-type="picture-card"
+                        :limit="maxNum"
+                        :on-exceed="exceedTips"
+                        :on-remove="handleRemoveFile"
+                        :before-upload="handleUploadFile"
+                        :http-request="uploadFile"
+                        :on-preview="handlePicturePreview"
+                      >
+                        <i class="el-icon-plus"
+                        ref="uploadImage"
+                        @paste="handlePaste" 
+                        contenteditable="" 
+                        @keydown="handleFocus"></i>
+                        <div class="el-upload__text">{{uploadText}}</div>
+                        <div slot="file" slot-scope="{file}">
+                          <img
+                            class="el-upload-list__item-thumbnail"
+                            :src="file.originalUrl" alt="">
+                          <span class="el-upload-list__item-actions">
+                            <span
+                              class="el-upload-list__item-preview"
+                              @click="handlePicturePreview(file)">
+                              <i class="el-icon-zoom-in"></i>
+                            </span>
+                            <span
+                              class="el-upload-list__item-delete"
+                              @click="handleRemoveFile(file)">
+                              <i class="el-icon-delete"></i>
+                            </span>
+                          </span>
+                        </div>
+                      </el-upload>
+                      <el-dialog 
+                        :visible.sync="dialogVisible" 
+                        :before-close="onCancel"
+                        append-to-body>
+                        <img width="100%" :src="dialogImageUrl" alt="">
+                      </el-dialog>
+                    </div>
+                  <!-- <div style="display: flex; gap: 0px;">
                     <el-form-item label="上传图片:" prop="image" class="mab" label-width="100px">
                       <el-upload
                         action="#"
@@ -448,8 +511,12 @@
                             </span>
                           </div>
                       </el-upload>
-                    </el-form-item>
+                      <div id="preview" class="click-to-upload" v-on:paste="handlePaste">
+                    <span style="color:#999">将图片按Ctrl+V 粘贴至此处</span>
                   </div>
+                    </el-form-item>
+                  </div> -->
+
                 </el-form>
                 <template #footer>
                   <div class="dialog-footer" style="text-align: right;">
@@ -689,6 +756,7 @@ const handleNodeClick = async (node) => {
   if (clickedNode) {
     clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
   }
+  ystableData.length = []
   searchInfo.value = '';
   // if (node.label === '客户编号') {
   //   // console.log('点击了客户编号')
@@ -770,19 +838,19 @@ const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
 const add_gdscgdformData = reactive({
   订单编号: 'DC2408001',
-  生产款号: '2403-1622款',
-  款式: '连衣裙',
-  客户编号: 'DC-7',
+  生产款号: '',
+  款式: '',
+  客户编号: '',
   落货日期: '',
-  箱唛要求: '折装装箱',
-  面料: '面布:乱麻复合布,拼布:AZ666雪纺,里布:弹力雪纺,配布:特别硬网眼布+欧根纱',
-  要求: '拼布位置要半成品烫钻',
-  船样描述: '8码/3件,10码1件',
-  船样合计: '4',
-  粘衬: 'C40朴(BVM40)黑色',
-  订单数量: '238',
+  箱唛要求: '',
+  面料: '',
+  要求: '',
+  船样描述: '',
+  船样合计: '',
+  粘衬: '',
+  订单数量: '',
   单位: '件',
-  Sys_id: '开单员',
+  Sys_id: '',
   制单日期: '',
   // 审核人: '',
   审核日期: '',
@@ -798,9 +866,8 @@ const addgd_onclick = () => {
 
   add_gddialogFormVisible.value = true
   add_gdscgdformData['订单号'] = '';
-  add_gdscgdformData['落货日期'] = '2024-06-27';
   add_gdscgdformData['制单日期'] = '2024-06-27';
-  add_gdscgdformData['审核日期'] = currentDates;
+  add_gdscgdformData['落货日期'] = '2024-07-28';
   }
 
 
@@ -826,7 +893,7 @@ const add_gdenterDialog = async ()=>{
 		粘衬: add_gdscgdformData['粘衬'],
 		订单数量: add_gdscgdformData['订单数量'],
 		单位: add_gdscgdformData['单位'],
-		Sys_id: add_gdscgdformData['Sys_id'],
+		Sys_id: add_gdscgdformData['制单人'],
 		接单日期: add_gdscgdformData['制单日期'],
 		// 审核人: add_gdscgdformData['审核人'],
 		// 审核日期: add_gdscgdformData['审核日期']
@@ -853,7 +920,7 @@ const add_gdyjdialogFormVisible = ref(false)
 const add_yszlformdata = reactive({
   ddh: '',
   ddzbh: '',
-  ys: '',
+  sxmc: '',
   cmgg: '',
   sfcy: '',
 });
@@ -879,6 +946,29 @@ const zdsformdata = reactive({
   zds8:'',
   zds9:'',
 });
+const sxhandleSizeChange = (value) => {
+  // console.log(value)
+  if (value === '红色') {
+    add_yszlformdata.sxmc = '红色'
+	} else if(value === '黄色'){
+    add_yszlformdata.sxmc = '黄色'
+  }else if(value === '蓝色'){
+    add_yszlformdata.sxmc = '蓝色'
+  }else if(value === '绿色'){
+    add_yszlformdata.sxmc = '绿色'
+  }else if(value === '紫色'){
+    add_yszlformdata.sxmc = '紫色'
+  }else if(value === '灰色'){
+    add_yszlformdata.sxmc = '灰色'
+  }else if(value === '咖啡'){
+    add_yszlformdata.sxmc = '咖啡'
+  }else if(value === '黑白'){
+    add_yszlformdata.sxmc = '黑白'
+  }else if(value === '经典色'){
+    add_yszlformdata.sxmc = '经典色'
+  }
+};
+
 const cmhandleSizeChange = (value) => {
   // console.log(value)
   if (value === '尺码数') {
@@ -925,21 +1015,21 @@ const addgdyj_onclick = () => {
   }
 }
 
-const dialogImageUrl = ref('')
-const dialogVisible = ref(false)
-const disabled = ref(false)
+// const dialogImageUrl = ref('')
+// const dialogVisible = ref(false)
+// const disabled = ref(false)
 const file =ref('')
- //新增颜色资料图片
- const handleRemove = (file) => {
-  console.log(file);
-}; 
-const handlePictureCardPreview = (file) => {
-  this.dialogImageUrl = file.url;
-  this.dialogVisible = true;
-}; 
-const handleDownload = (file) => {
-  console.log(file);
-}; 
+//  //新增颜色资料图片
+//  const handleRemove = (file) => {
+//   console.log(file);
+// }; 
+// const handlePictureCardPreview = (file) => {
+//   this.dialogImageUrl = file.url;
+//   this.dialogVisible = true;
+// }; 
+// const handleDownload = (file) => {
+//   console.log(file);
+// }; 
 // const beforeUpload = (file) => {  
 //       return false; // 阻止自动上传  
 //     };  
@@ -967,7 +1057,7 @@ const add_gdyjenterDialog =  async  () => {
   const addyszltable = {
     订单编号: add_yszlformdata['ddh'],
 		子订单编号: add_yszlformdata['ddzbh'],
-		颜色: add_yszlformdata['ys'],
+		颜色: add_yszlformdata['sxmc'],
     款号: add_yszlformdata['kh'],
 		船样: cy,
     Sys_id:add_yszlformdata['kdy'],
@@ -1118,20 +1208,21 @@ const ddtableData = reactive([])
 const jstableData = reactive([])
 // 点击工单行按钮
 const tableRowClick = async (row) => {
-  console.log(row.订单编号)
-  _Gd_gdbh.value = row.订单编号
-  _ddhval.value = row.订单编号
+    console.log(row.订单编号)
+    _Gd_gdbh.value = row.订单编号
+    _ddhval.value = row.订单编号
     try {
-      const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
-      sizeDatas.splice(0,PrintListDatas.data.型号.length,...PrintListDatas.data.型号);//型号数据
-    ystableData.splice(0,PrintListDatas.data.列表.length,...PrintListDatas.data.列表);//表格数据
-    // gytableData.splice(0,gyData.length,...gyData);//表格数据
-    // ddtableData.splice(0,ddData.length,...ddData);//表格数据
-    // jstableData.splice(0,jsData.length,...jsData);//表格数据
-  } catch (error) {
-    console.error(error);
-  }
-  }
+        const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
+        if(PrintListDatas.data.列表.length === 0){
+          ystableData.length = []
+        }else{
+          sizeDatas.splice(0,PrintListDatas.data.型号.length,...PrintListDatas.data.型号);//型号数据
+          ystableData.splice(0,PrintListDatas.data.列表.length,...PrintListDatas.data.列表);//表格数据
+        }
+      } catch (error) {
+        console.error(error);
+    }
+}
 
 
 const table_del = ref(true)
@@ -1147,16 +1238,20 @@ const handleSelectionChange = (selection, type) => {
 
 //删除按钮
 const del_ddzlClick = async () => {
-  console.log(table_Selection.value)
+  console.log(table_Selection._value)
 
+  let params = {};  
+  params.Uniqid = '8'; 
+  console.log(params)
+  
   // if (table_Selection.value !== '') {
-  //   try {
-  //     const res1 = await orderDataDel({Uniqid:table_Selection.value})
-  //     res1.code === 0 && ElMessage.success('删除成功')
-  //   } catch(err) {
-  //     ElMessage.error(err)
-  //   }
-  // }
+    // try {
+      const res1 = await orderDataDel(params)
+      res1.code === 0 && ElMessage.success('删除成功')
+    // } catch(err) {
+      // ElMessage.error(err)
+    // }
+  // } 
 }
 
 
@@ -1322,6 +1417,117 @@ const _cha_WorkList = async (node) => {
   }
 };
 
+
+//图片粘贴拖拽上传
+const props = defineProps({  
+  fileList: {  
+    type: Array,  
+    default: () => []  
+  },  
+  uploadText: {  
+    type: String,  
+    default: ''  
+  },  
+  maxNum: {  
+    type: Number,  
+    default: 5  
+  }  
+});  
+  
+const emit = defineEmits(['getImage']);  
+  
+const dialogVisible = ref(false);  
+const dialogImageUrl = ref('');  
+  
+watch(() => props.fileList, (newVal, oldVal) => {  
+  emit('getImage', newVal);  
+  const uploadEl = document.querySelector('.el-upload');  
+  if (newVal.length >= 5) {  
+    uploadEl.style.display = 'none';  
+  } else {  
+    uploadEl.style.display = 'inline-block';  
+  }  
+});  
+  
+const handleFocus = () => {  
+  // 注意:这里可能需要调整,因为 ref 可能无法直接通过 $refs 访问  
+  // 假设你有一个上传组件的 ref,你可能需要这样使用它:  
+  // if (uploadRef.value) uploadRef.value.blur();  
+};  
+  
+const exceedTips = () => {  
+  ElMessage.error(`最多只能上传${props.maxNum}张图片`);  
+};  
+  
+const handleRemoveFile = (file) => {  
+  const index = props.fileList.findIndex(i => i.originalUrl === file.originalUrl);  
+  if (index !== -1) {  
+    // 注意:直接修改 props 是不推荐的,但在这个场景下,你可能需要通知父组件更新  
+    // 更好的做法是使用 emit 发送一个事件,让父组件来处理  
+    // 这里为了简化,我们直接修改(不推荐)  
+    props.fileList.splice(index, 1);  
+    emit('getImage', [...props.fileList]); // 通知父组件更新  
+  }  
+};  
+  
+const handleUploadFile = (file) => {  
+  const isImage = file.type.includes('image');  
+  const imgCount = props.fileList.length;  
+  if (!isImage) {  
+    ElMessage.error('请上传图片格式的文件');  
+    return false;  
+  }  
+  if (imgCount >= props.maxNum) {  
+    ElMessage.error(`最多只能上传${props.maxNum}张图片`);  
+    return false;  
+  }  
+  return true;  
+};  
+  
+const uploadFile = (file) => {  
+  uploadImageUsingFile({ imageFile: file.file, type: 3 })  
+    .then(value => {  
+      if (value.code === '0') {  
+        // 注意:直接修改 props 是不推荐的,但这里为了简化,我们直接修改  
+        // 更好的做法是使用 emit 发送一个事件,让父组件来处理  
+        props.fileList.push(value.data);  
+        emit('getImage', [...props.fileList]); // 通知父组件更新  
+      } else {  
+        ElMessage.error('图片上传失败');  
+      }  
+    })  
+    .catch(err => {  
+      ElMessage.error('图片上传失败');  
+      console.log(err);  
+    });  
+};  
+  
+const handlePicturePreview = (file) => {  
+  dialogImageUrl.value = file.originalUrl;  
+  dialogVisible.value = true;  
+};  
+  
+const onCancel = () => {  
+  dialogVisible.value = false;  
+  dialogImageUrl.value = '';  
+};  
+  
+const handlePaste = (event) => {  
+  event.preventDefault();  
+  const items = (event.clipboardData || window.clipboardData).items;  
+  if (!items || items.length === 0) {  
+    ElMessage.error("当前不支持本地图片上传");  
+    return;  
+  }  
+  for (let i = 0; i < items.length; i++) {  
+    if (items[i].type.includes('image')) {  
+      const file = items[i].getAsFile();  
+      uploadFile({ file });  
+      break;  
+    }  
+  }  
+};  
+
 //=========技术附件========
 // //点击技术附件按钮
 // const jsfjClick = () => {
@@ -1620,9 +1826,7 @@ const luckyexcelCloseDialog = () => {
 .el-pagination{
   margin-top: 0px !important;
 }
-.mab{
-  margin-bottom: 5px;
-}
+
 /* 图片 */
 .avatar-uploader {
   width: 500px;
@@ -1659,4 +1863,73 @@ const luckyexcelCloseDialog = () => {
   color: #8c939d;
   font-size: 14px;
 }
+.mab{
+  margin-bottom: 5px;
+}
+::v-deep(.input_style .el-input__inner) {  
+  font-size: 18px; 
+}  
+::v-deep(.el-form-item__label) {  
+  font-size: 18px; 
+}
+
+/* 图片粘贴上传*/
+.uploadImage {  
+  width: 100%;  
+  user-select: none;  
+  
+  ::v-deep .el-form-item__content {  
+    width: 97%;  
+    line-height: unset;  
+  }  
+  
+  ::v-deep .el-upload-list__item {  
+    width: 100px;  
+    height: 100px;  
+    margin: 0 8px 0 0;  
+  
+    &.is-ready {  
+      display: none !important;  
+    }  
+  
+    &.is-success {  
+      > :first-child {  
+        width: 100%;  
+        height: 100%;  
+      }  
+    }  
+  }  
+  
+  ::v-deep .el-upload--picture-card {  
+    width: 100px;  
+    height: 100px;  
+    line-height: unset;  
+    border: none;  
+  
+    .el-upload-dragger {  
+      width: 100px;  
+      height: 100px;  
+      display: flex;  
+      flex-direction: column;  
+      align-items: center;  
+      justify-content: center;  
+  
+      .el-icon-plus {  
+        position: absolute;  
+        width: 100%;  
+        height: 100%;  
+        top: 20px;  
+        outline: none;  
+        caret-color: transparent;  
+      }  
+  
+      .el-upload__text {  
+        font-size: 12px;  
+        font-weight: 700;  
+        margin-top: 28px;  
+        color: #8c939d;  
+      }  
+    }  
+  }  
+} 
 </style>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels