liuhairui há 1 ano atrás
pai
commit
598a28cf7e

+ 219 - 97
src/view/performance/baozhuangbaogong.vue

@@ -3,14 +3,18 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <!--按钮部分-->
+          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
-			   <el-button type="primary" @click="onxiaopiaoclick" style="margin: 5px">补打小票</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;height:40px;"></el-input>
+              <el-button type="primary"  @click="onSubmit"  		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;" icon="search" >查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
+			  <!-- <el-button type="primary"  @click="onxiaopiaoclick" 	
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;background-color: #20a53a;">补打小票</el-button> -->
             </el-form-item>
           </el-form>
         </div>
@@ -21,7 +25,7 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3>包装报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
 
@@ -33,27 +37,26 @@
 			<el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
 				  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-				  :data="tableData"  border row-key="ID"
-				  size="small" 
+				  :data="tableData"  border row-key="ID" size="small" 
 				  highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 				  @row-click="tableRowClick" :show-overflow-tooltip="true"
 				  @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-				<el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-				<el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-				<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="100" />
-				<el-table-column  sortable  align="left" label="组别" prop="组别" width="110" />
-				<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="订单累计入仓数量" width="220" />
-				<el-table-column  sortable  align="left" label="是否尾包" prop="是否尾包" width="100" />
-				<el-table-column  sortable  align="left" label="记录员" prop="记录员" width="90" />
-				<el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+				<!-- <el-table-column type="selection" width="55" /> -->
+				<el-table-column  sortable 	align="center" label="序号" 	prop="序号"  		width="70" />
+				<el-table-column  sortable 	align="left" label="订单子编号" 	prop="订单子编号"  	width="115"/>
+				<el-table-column  sortable  align="left" label="订单号" 		prop="订单号" 		width="115"/>
+				<el-table-column  sortable  align="left" label="生产款号" 	prop="生产款号" 		width="120" />
+				<el-table-column  sortable  align="left" label="款式" 		prop="款式" 		width="100" />
+				<el-table-column  sortable  align="left" label="颜色" 		prop="颜色" 		width="80"  />
+				<el-table-column  sortable  align="left" label="制单总数" 	prop="制单总数" 		width="100" />
+				<el-table-column  sortable  align="left" label="组别" 		prop="组别" 		width="100" />
+				<el-table-column  sortable  align="left" label="排产单数" 	prop="排产单数" 		width="100" />
+				<el-table-column  sortable  align="left" label="尺码" 		prop="尺码" 		width="70" />
+				<el-table-column  sortable  align="left" label="报工数量" 	prop="报工数量" 		width="100" />
+				<el-table-column  sortable  align="left" label="是否尾包" 	prop="是否尾包" 		width="100" />
+				<el-table-column  sortable  align="left" label="工序" 		prop="工序" 		width="80" />
+				<el-table-column  sortable  align="left" label="验片人" 		prop="验片人" 		width="90" />
+				<el-table-column  sortable  align="left" label="日期" 		prop="日期" 		width="100" />
 			</el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -63,10 +66,10 @@
 <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
             </div>
           </div>
-
+		  
           <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog" destroy-on-close style="width: 100%; height: 100%;margin: 0%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
+				<h1 style="margin: 0%;margin-bottom: 10px;">包装报工修改</h1>
 				<el-row :gutter="24">
 					<el-col :span="10">
 						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -128,19 +131,19 @@
 					</el-col>
 				</el-row>
 				<el-row :gutter="24" >
-				<el-col :span="10">
-					<el-form-item label="是否尾包:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
-						<el-select v-model="edit_formData['是否订单尾包']" style="width: 60%; height: 40px;" id="是否订单尾包">
-							<el-option label="是" value="是"></el-option>
-							<el-option label="否" value="否"></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="11">
-					<el-form-item label="订单累计入仓数量:" prop="deliveryDate" class="mab" label-width="270" style="font-size: 30px;margin: 10px;">
-						<el-input v-model="edit_formData['订单累计入仓数量']" style="width: 60%; height: 40px;" id="订单累计入仓数量" />
-					</el-form-item>
-				</el-col>
+					<el-col :span="10">
+						<el-form-item label="是否尾包:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
+							<el-select v-model="edit_formData['是否订单尾包']" style="width: 60%; height: 40px;" id="是否订单尾包">
+								<el-option label="是" value="是"></el-option>
+								<el-option label="否" value="否"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="订单累计入仓数量:" prop="deliveryDate" class="mab" label-width="270" style="font-size: 30px;margin: 10px;">
+							<el-input v-model="edit_formData['订单累计入仓数量']" style="width: 52%; height: 40px;" id="订单累计入仓数量" />
+						</el-form-item>
+					</el-col>
 				</el-row>
 				<el-row :gutter="24" style="margin-bottom: 20px;">
 					<el-col :span="10">
@@ -164,7 +167,7 @@
 
 		 <!-- 新增弹窗 -->
 		  <el-dialog v-model="AttendanceVisible"  destroy-on-close style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">成品入库</h1>
+			  <h1 style="margin: 0%;margin-bottom: 10px;">包装报工</h1>
 			  <el-row :gutter="24" style="margin-bottom: 15px;">
 			      <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
@@ -185,7 +188,7 @@
 				  <el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="100">
 					  <el-input v-model="add_formData['人员']" style="width: 120px;height: 40px;" id="人员" />
 				  </el-form-item>
-
+			
 				  <el-form-item label="尺码:" prop="joinDate" style="font-size: 30px;" label-width="110">
 					<el-select v-model="add_formData['尺码']" style="width: 120px;" id="尺码">
 					  <el-option label="32" value="32"></el-option>
@@ -196,7 +199,7 @@
 					</el-select>
 				</el-form-item>
 				 <el-form-item label="数量:" prop="joinDate" style="font-size: 30px;"  label-width="110">
-					<el-input v-model="add_formData['数量']" style="width: 120px;height: 40px;" id="人员" />
+					<el-input v-model="add_formData['数量']" style="width: 150px;height: 40px;" id="人员" />
 				</el-form-item>
 				<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px;"  label-width="150">
 					<el-select v-model="add_formData['是否订单尾包']" style="width: 120px;height: 40px;" id="尺码" @change="wbSelectChange">
@@ -205,41 +208,67 @@
 					</el-select>
 				  </el-form-item>
 			  </el-row>
-		      <el-row :gutter="24" style="margin-bottom: 15px;">
+		      <el-row :gutter="24" style="margin-bottom: 10px;">
 				  <div @contextmenu.prevent>
 					   <el-table
 						   ref="multipleTableRef"
 						   style="width: 100%;height: 40vh"
 						   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"
+						   :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="add_updateCompanyFunc"
-						   @row-click="add_tableRowClick"
-						   @row-contextmenu="handleRightClick"
-						   :show-overflow-tooltip="true"
-						   @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="310"/>
-						  <el-table-column sortable align="left" label="订单号" prop="订单号" width="310"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="380"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="310"/>
-						  <el-table-column sortable align="left" label="颜色" prop="颜色" width="310"/>
+						   @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+						   :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+						<el-table-column type="selection" width="70" />
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 						</el-table>
 				</div>
 		      </el-row>
 			  
+			   <el-row :gutter="24" style="margin-bottom: 10px;">
+				   <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+				       <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-form-item>
+			  </el-row>
+			  
+			  
+			  <el-row :gutter="24">
+			      <el-form-item label="数量:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+			          <el-input v-model="scsformdata.scs1" disabled style="width: 90px;height: 40px;" id="scs1"/>
+			          <el-input v-model="scsformdata.scs2" disabled style="width: 90px;height: 40px;" id="scs2"/>
+			          <el-input v-model="scsformdata.scs3" disabled style="width: 90px;height: 40px;" id="scs3"/>
+			          <el-input v-model="scsformdata.scs4" disabled style="width: 90px;height: 40px;" id="scs4"/>
+			          <el-input v-model="scsformdata.scs5" disabled style="width: 90px;height: 40px;" id="scs5"/>
+			          <el-input v-model="scsformdata.scs6" disabled style="width: 90px;height: 40px;" id="scs6"/>
+			          <el-input v-model="scsformdata.scs7" disabled style="width: 90px;height: 40px;" id="scs7"/>
+			          <el-input v-model="scsformdata.scs8" disabled style="width: 90px;height: 40px;" id="scs8"/>
+			          <el-input v-model="scsformdata.scs9" disabled style="width: 90px;height: 40px;" id="scs9"/>
+			      </el-form-item>
+			  </el-row>
+			  
 		      <template #footer>
 		          <div class="dialog-footer" >
 		              <el-button 				@click="add_closeDialog" style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
-					  <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button>
+		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					  <!-- <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button> -->
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -291,17 +320,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '包装报工完成记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -349,12 +375,12 @@ const _getStaffList = async ()=>{
 		      '款式':'连衣裙',
 		      '颜色':'红色',
 			  '制单总数':'90',
-			  '组别':'服装厂1组',
+			  '组别':'车缝1组',
 			  '排产单数':'50',
 			  '尺码':'32',
-			  '入仓数量':'42',
-			  '订单累计入仓数量':'40',
-		      '是否尾包':'否',
+			  '入仓数量':'10',
+			  '是否尾包':'否',
+		      '订单累计入仓数量':'12',
 		      '记录员':'xxx',
 		      '日期':'2024-07-16'
 		    },
@@ -366,13 +392,13 @@ const _getStaffList = async ()=>{
 			  '款式':'长袖',
 			  '颜色':'蓝色',
 			  '制单总数':'90',
-			  '组别':'服装厂1组',
+			  '组别':'车缝2组',
 			  '排产单数':'60',
 			  '尺码':'35',
-			  '入仓数量':'95',
-			  '订单累计入仓数量':'163',
-		      '是否尾包':'否',
-		      '记录员':'xxx',
+			  '入仓数量':'58',
+			  '是否尾包':'否',
+			  '订单累计入仓数量':'25',
+			  '记录员':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -383,13 +409,13 @@ const _getStaffList = async ()=>{
 			  '款式':'西服',
 			  '颜色':'白色',
 			  '制单总数':'90',
-			  '组别':'服装厂2组',
+			  '组别':'车缝3组',
 			  '排产单数':'60',
 			  '尺码':'35',
-			  '入仓数量':'55',
-			  '订单累计入仓数量':'111',
-		      '是否尾包':'否',
-		      '记录员':'xxx',
+			  '入仓数量':'58',
+			  '是否尾包':'否',
+			  '订单累计入仓数量':'66',
+			  '记录员':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -400,13 +426,13 @@ const _getStaffList = async ()=>{
 			  '款式':'裤子',
 			  '颜色':'黑色',
 			  '制单总数':'90',
-			  '组别':'服装厂3组',
+			  '组别':'车缝4组',
 			  '排产单数':'40',
 			  '尺码':'36',
-			  '入仓数量':'60',
-			  '订单累计入仓数量':'124',
-		      '是否尾包':'是',
-		      '记录员':'xxx',
+			  '入仓数量':'37',
+			  '是否尾包':'是',
+			  '订单累计入仓数量':'34',
+			  '记录员':'xxx',
 			  '日期':'2024-07-16'
 			},
 		    
@@ -439,9 +465,6 @@ const onAttendance = () => {
         }
     }, 100); // 延迟100毫秒
 	gd_clearFormData();
-	add_formData['机台号'] = '总检'
-	add_formData['工序'] = '库房'
-	add_formData['组别'] = '库房'
 	add_formData['人员'] = 'xxx'
 	add_searchInfo.value = ''
 	const WorkListdata = [];
@@ -456,6 +479,30 @@ const add_formData = reactive({
   数量: '',
   是否订单尾包: '',
 });
+// 尺码
+const cmformdata = reactive({
+  cm1:'S',
+  cm2:'M',
+  cm3:'L',
+  cm4:'XL',
+  cm5:'2XL',
+  cm6:'',
+  cm7:'',
+  cm8:'',
+  cm9:'合计',
+});
+// 实裁数
+const scsformdata = reactive({
+  scs1:'',
+  scs2:'',
+  scs3:'',
+  scs4:'',
+  scs5:'',
+  scs6:'',
+  scs7:'',
+  scs8:'',
+  scs9:'',
+});
 // 新增确定
 const add_Dialog = () => {
    // AttendanceVisible.value = false
@@ -500,16 +547,29 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
+		add_formData['机台号'] = '包装'
+		add_formData['工序'] = '包装'
+		add_formData['组别'] = '包装1组'
 		add_formData['尺码'] = '32'
 		add_formData['数量'] = '10'
 		add_formData['是否订单尾包'] = '否'
@@ -524,6 +584,9 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '包装'
+		add_formData['工序'] = '包装'
+		add_formData['组别'] = '包装1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '否'
@@ -538,10 +601,69 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '包装'
+		add_formData['工序'] = '包装'
+		add_formData['组别'] = '包装1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '是'
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		scsformdata['scs1'] = 34
+		scsformdata['scs2'] = 12
+		scsformdata['scs3'] = 53
+		scsformdata['scs4'] = 44
+		scsformdata['scs5'] = 15
+		scsformdata['scs9'] = 158
+		add_formData['机台号'] = '包装'
+		add_formData['工序'] = '包装'
+		add_formData['组别'] = '包装1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		scsformdata['scs1'] = 23
+		scsformdata['scs2'] = 26
+		scsformdata['scs3'] = 48
+		scsformdata['scs4'] = 67
+		scsformdata['scs5'] = 12
+		scsformdata['scs9'] = 176
+		add_formData['机台号'] = '包装'
+		add_formData['工序'] = '包装'
+		add_formData['组别'] = '包装1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -567,7 +689,7 @@ const add_tableRowClick = async (row) => {
   roww.value = row
 }
 //双击
-const gyupdateCompanyFunc = async (row) => {
+const add_updateCompanyFunc = async (row) => {
 
 }
 //右键
@@ -602,7 +724,7 @@ const add_xpSelectionChange = (selection, type) => {
             cm: add_formData['尺码'],
             sl: add_formData['数量'],
             zb: add_formData['组别'],
-            dyrq: currentDate,
+            dyrq: currentDates,
             wb: add_formData['是否订单尾包'],
         };
     }

+ 212 - 148
src/view/performance/caiqiebaogong.vue

@@ -6,10 +6,11 @@
           <!--          按钮部分-->
           <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="margin: 0px 5px 0px 0px;width: 180px;height:40px;border-radius: 5%;"></el-input>
+              <el-button type="primary" icon="search" @click="onSubmit" style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -60,114 +61,90 @@
             </div>
           </div>
 
-          <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="'修改员工基本资料'" destroy-on-close>
-            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-              <div class="form-container">
-                <!-- 左侧部分 -->
-                <div class="form-column" style="width: 36%;">
-                  <el-form-item label="员工编号:" prop="employeeId" class="mab" >
-                    <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;"
-                              id="员工编号" @keydown="handleKeyDown($event, '员工编号', '在职状态', '性别')" />
-                  </el-form-item>
-                  <el-form-item label="性别:" prop="gender" class="mab">
-                    <el-input v-model="formDataTest['性别']"  placeholder="" style="width: 190px;"
-                              id="性别" @keydown="handleKeyDown($event, '性别', '员工编号', '身份证号')" />
-                  </el-form-item>
-                  <el-form-item label="身份证号:" prop="gender" class="mab">
-                    <el-input v-model="formDataTest['身份证号']"  placeholder="" style="width: 190px;"
-                              id="身份证号"  @keydown="handleKeyDown($event, '身份证号', '性别', '所在部门')" />
-                  </el-form-item>
-                  <el-form-item label="部门名称:" prop="gender"  class="mab">
-                    <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;"
-                              id="所在部门" @keydown="handleKeyDown($event, '所在部门', '身份证号', '聘用日期')" />
-                  </el-form-item>
-                  <el-form-item label="入职日期:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;"
-                              id="聘用日期" @keydown="handleKeyDown($event, '聘用日期', '所在部门', '人员类别')" />
-                  </el-form-item>
-                  <el-form-item label="人员类别:" prop="joinDate" >
-                    <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;" id="人员类别"
-                               @keydown="handleKeyDown($event, '人员类别', '聘用日期', '班次类型')"
-                    >
-                      <el-option label="生产" value="生产"></el-option>
-                      <el-option label="行政" value="行政"></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="班次类型:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;"
-                              id="班次类型" @keydown="handleKeyDown($event, '班次类型', '人员类别', '工资表类别')" />
-                  </el-form-item>
-                  <el-form-item label="工资表类别:" prop="joinDate" class="mab">
-                    <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;"
-                               id="工资表类别" @keydown="handleKeyDown($event, '工资表类别', '班次类型', 'U8在职')"
-                    >
-                      <el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
-                      <el-option label="另发工资" value="另发工资"></el-option>
-                      <el-option label="操作级计件工资表" value="操作级计件工资表"></el-option>
-                      <el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="U8在职:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;"
-                              id="U8在职" @keydown="handleKeyDown($event, 'U8在职', '工资表类别', '员工姓名')" />
-                  </el-form-item>
-                </div>
-
-                <!-- 中间部分 -->
-                <div class="form-column">
-                  <el-form-item label="员工姓名:" prop="name" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;"
-                              id="员工姓名" @keydown="handleKeyDown($event, '员工姓名', 'U8在职', '出生日期')" />
-                  </el-form-item>
-                  <el-form-item label="出生日期:" prop="birthDate" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['出生日期']"  placeholder="" style="width: 190px;"
-                              id="出生日期" @keydown="handleKeyDown($event, '出生日期', '员工姓名', '职称职务')" />
-                  </el-form-item>
-                  <el-form-item label="职务:" prop="position" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;"
-                              id="职称职务" @keydown="handleKeyDown($event, '职称职务', '出生日期', '部门编码')" />
-                  </el-form-item>
-                  <el-form-item label="部门编号:" prop="position" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;"
-                              id="部门编码" @keydown="handleKeyDown($event, '部门编码', '职称职务', '转正日期')" />
-                  </el-form-item>
-                  <el-form-item label="转正日期:" prop="departmentId" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;"
-                              id="转正日期" @keydown="handleKeyDown($event, '转正日期', '部门编码', '扣减司龄')" />
-                  </el-form-item>
-                  <el-form-item label="扣减司龄:" prop="departmentId" class="mab" label-width="100">
-                    <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;"
-                              id="扣减司龄" @keydown="handleKeyDown($event, '扣减司龄', '转正日期', '人员性质')" />
-                  </el-form-item>
-                  <el-form-item label="人员性质:" prop="departmentId" class="mab" label-width="100">
-                    <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;"
-                               id="人员性质" @keydown="handleKeyDown($event, '人员性质', '扣减司龄', '薪酬核算分组')"
-                    >
-                      <el-option label="退休返聘" value="退休返聘"></el-option>
-                      <el-option label="劳动合同工" value="劳动合同工"></el-option>
-                      <el-option label="借用" value="借用"></el-option>
-                      <el-option label="劳务派遣" value="劳务派遣"></el-option>
-                      <el-option label="实习生" value="实习生"></el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="工资核算分组:" prop="joinDate" class="mab" label-width="100" >
-                    <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;"
-                              id="薪酬核算分组" @keydown="handleKeyDown($event, '薪酬核算分组', '人员性质', '在职状态')" />
-                  </el-form-item>
-                  <el-form-item label="在职状态:" prop="joinDate" class="mab" label-width="100"  >
-                    <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;"
-                              id="在职状态" @keydown="handleKeyDown($event, '在职状态', '薪酬核算分组', '员工编号')" />
-                  </el-form-item>
-                </div>
-              </div>
-            </el-form>
-            <!-- 添加编辑页面取消确定按钮 -->
-              <div  style="text-align: right; ">
-                <el-button @click="closeDialog">取消</el-button>
-                <el-button type="primary"  @click="enterDialog">确定</el-button>
-              </div>
-          </el-dialog>
+
+          <!-- 修改弹窗 -->
+			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"  destroy-on-close style="width: 60%; height: 70%;">
+				<h1 style="margin: 0%;margin-bottom: 10px;">裁切报工修改</h1>
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="订单号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['订单号']" style="width: 70%; height: 40px;" id="订单号:" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['订单子编号']" style="width: 70%; height: 40px;" id="订单子编号" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="生产款号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['生产款号']" style="width: 70%; height: 40px;" id="生产款号" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="款式:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['款式']" style="width: 70%; height: 40px;" id="款式" />
+						</el-form-item>
+					</el-col>	
+				</el-row>
+
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="颜色:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['颜色']" style="width: 70%; height: 40px;" id="颜色" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="制单总数:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['制单总数']" style="width: 70%; height: 40px;" id="制单总数" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="实裁总数:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['实裁总数']" style="width: 70%; height: 40px;" id="实裁总数" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="单位:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['单位']" style="width: 70%; height: 40px;" id="单位" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="工序:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['工序']" style="width: 70%; height: 40px;" id="工序" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="10">
+						<el-form-item label="验片人:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['验片人']" style="width: 70%; height: 40px;" id="验片人" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row :gutter="24"  style="margin-bottom: 5px;">
+					<el-col :span="10">
+						<el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
+							<el-input v-model="edit_formData['日期']" style="width: 70%; height: 40px;" id="日期" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<template #footer>
+					<div class="dialog-footer">
+						<el-button @click="edit_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
+						<el-button type="primary" @click="edit_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					</div>
+				</template>
+			</el-dialog>
 
 		 <!-- 新增弹窗 -->
 		  <el-dialog v-model="AttendanceVisible" destroy-on-close  style="width: 100%;height: 100%;margin: 0px;">
@@ -193,11 +170,16 @@
 		                    size="small" highlight-current-row="true" @row-dblclick="add_updateCompanyFunc"
 		                    @row-click="add_tableRowClick" :show-overflow-tooltip="true"
 		                    @selection-change="handleSelectionChange">
-		              <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="160"/>
-		              <el-table-column sortable align="center" label="订单号" prop="订单号" width="160"/>
-		              <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="205"/>
-		              <el-table-column sortable align="left" label="款式" prop="款式" width="160"/>
-		              <el-table-column sortable align="left" label="颜色" prop="颜色" width="160"/>
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 		          </el-table>
 		      </el-row>
 		      
@@ -246,7 +228,7 @@
 		      <template #footer>
 		          <div class="dialog-footer">
 		              <el-button @click="add_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
+		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -341,17 +323,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '验片完工记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -394,46 +373,73 @@ const _getStaffList = async ()=>{
 		const WorkListdata = [
 		    {
 		      '序号':'1',
-		      '订单子编号':'XXX001-1',
-		      '订单号':'XXX001',
-		      '生产款号':'2403-1622款',
+		      '订单子编号':'2408001-1',
+			  '订单号':'2408001',
+		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
 		      '颜色':'红色',
-		      '制单总数':'90',
-		      '实裁总数':'95',
-		      '单位':'件',
-		      '工序':'裁切',
+			  '制单总数':'90',
+			  '组别':'车缝1组',
+			  '排产单数':'50',
+			  '尺码':'32',
+			  '报工数量':'10',
+			  '是否尾包':'否',
+		      '工序':'仓库出库',
 		      '验片人':'xxx',
 		      '日期':'2024-07-16'
 		    },
 			{
 			  '序号':'2',
-			  '订单子编号':'XXX002-1',
-			  '订单号':'XXX002',
-			  '生产款号':'2403-1622款',
-			  '款式':'裤子',
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2402-1623款',
+			  '款式':'长袖',
 			  '颜色':'蓝色',
 			  '制单总数':'90',
-			  '实裁总数':'95',
-			  '单位':'件',
-			  '工序':'裁切',
+			  '组别':'车缝2组',
+			  '排产单数':'60',
+			  '尺码':'35',
+			  '报工数量':'58',
+			  '是否尾包':'否',
+			  '工序':'仓库出库',
 			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
 			  '序号':'3',
-			  '订单子编号':'XXX003-1',
-			  '订单号':'XXX003',
-			  '生产款号':'2403-1622款',
+			  '订单子编号':'2408002-2',
+			  '订单号':'2408002',
+			  '生产款号':'2403-1624款',
 			  '款式':'西服',
+			  '颜色':'白色',
+			  '制单总数':'90',
+			  '组别':'车缝3组',
+			  '排产单数':'60',
+			  '尺码':'35',
+			  '报工数量':'58',
+			  '是否尾包':'否',
+			  '工序':'仓库出库',
+			  '验片人':'xxx',
+			  '日期':'2024-07-16'
+			},
+			{
+			  '序号':'4',
+			  '订单子编号':'2408003-3',
+			  '订单号':'2408003',
+			  '生产款号':'2403-1625款',
+			  '款式':'裤子',
 			  '颜色':'黑色',
 			  '制单总数':'90',
-			  '实裁总数':'95',
-			  '单位':'件',
-			  '工序':'裁切',
+			  '组别':'车缝4组',
+			  '排产单数':'40',
+			  '尺码':'36',
+			  '报工数量':'37',
+			  '是否尾包':'是',
+			  '工序':'仓库出库',
 			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
+		    
 		];
 		console.log(WorkListdata)
 		tableData.splice(0,tableData.length,...WorkListdata);//表格数据
@@ -530,6 +536,8 @@ const add_searchInfo = ref('')
 //点击【查询】按钮
 const add_onSubmit = async ()=>{
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
+	const WorkListdata = [];
+	add_tableData.splice(0,add_tableData.length,...WorkListdata);
     ElMessage({type: 'warning',message: '搜索内容不能为空' })
   }else{
 	console.log(add_searchInfo.value)
@@ -540,14 +548,24 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
@@ -573,6 +591,38 @@ const add_onSubmit = async ()=>{
 		    },
 		];
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -584,6 +634,7 @@ const add_onSubmit = async ()=>{
   }
 };
 
+
 // =========== 删除按钮 ===========
 const bgSelection = ref(null)
 const baogong_del = () => {
@@ -602,13 +653,27 @@ const handleSelectionChange = (selection, type) => {
 }
 
 // =========== 修改 ===========
+const dialogFormVisible = ref(false)
+const edit_formData = ref({})
 // 双击修改
 const updateCompanyFunc = async (row) => {
+	console.log(row)
+	dialogFormVisible.value = true;
+	Object.assign(edit_formData.value,row);
   // let code = row['员工编号'];
   // const getStaffInfo_data = await getStaffInfo({code:code});
   // formDataTest.value = getStaffInfo_data.data;
-  // dialogFormVisible.value = true;
 };
+// 弹窗修改确定
+const edit_Dialog = async () => {
+	_ygjbzledit();
+}
+
+// 弹窗修改关闭
+const edit_closeDialog = () => {
+	dialogFormVisible.value = false
+}
+
 
 // =========== 分页 ===========
 // 分页相关的响应式变量
@@ -628,8 +693,7 @@ const handleSizeChange = (val) => {
   _getStaffList();
 };
 
-// 弹窗控制标记
-const dialogFormVisible = ref(false)
+
 //修改
 const formDataTest = ref({})
 

+ 119 - 67
src/view/performance/chafengbaogong.vue

@@ -3,14 +3,18 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <!--按钮部分-->
+          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
-			   <el-button type="primary" @click="onxiaopiaoclick" style="margin: 5px">补打小票</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;height:40px;"></el-input>
+              <el-button type="primary"  @click="onSubmit"  		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;" icon="search" >查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
+			  <el-button type="primary"  @click="onxiaopiaoclick" 	
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;background-color: #20a53a;">补打小票</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -21,7 +25,7 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3>车缝完工报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
 
@@ -33,27 +37,26 @@
 			<el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
 				  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-				  :data="tableData"  border row-key="ID"
-				  size="small" 
+				  :data="tableData"  border row-key="ID" size="small" 
 				  highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 				  @row-click="tableRowClick" :show-overflow-tooltip="true"
 				  @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-				<el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-				<el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-				<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="100" />
-				<el-table-column  sortable  align="left" label="组别" prop="组别" width="110" />
-				<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="是否尾包" width="110" />
-				<el-table-column  sortable  align="left" label="工序" prop="工序" width="80" />
-				<el-table-column  sortable  align="left" label="验片人" prop="验片人" width="90" />
-				<el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+				<!-- <el-table-column type="selection" width="55" /> -->
+				<el-table-column  sortable 	align="center" label="序号" 	prop="序号"  		width="70" />
+				<el-table-column  sortable 	align="left" label="订单子编号" 	prop="订单子编号"  	width="115"/>
+				<el-table-column  sortable  align="left" label="订单号" 		prop="订单号" 		width="115"/>
+				<el-table-column  sortable  align="left" label="生产款号" 	prop="生产款号" 		width="120" />
+				<el-table-column  sortable  align="left" label="款式" 		prop="款式" 		width="100" />
+				<el-table-column  sortable  align="left" label="颜色" 		prop="颜色" 		width="80"  />
+				<el-table-column  sortable  align="left" label="制单总数" 	prop="制单总数" 		width="100" />
+				<el-table-column  sortable  align="left" label="组别" 		prop="组别" 		width="100" />
+				<el-table-column  sortable  align="left" label="排产单数" 	prop="排产单数" 		width="100" />
+				<el-table-column  sortable  align="left" label="尺码" 		prop="尺码" 		width="70" />
+				<el-table-column  sortable  align="left" label="报工数量" 	prop="报工数量" 		width="100" />
+				<el-table-column  sortable  align="left" label="是否尾包" 	prop="是否尾包" 		width="100" />
+				<el-table-column  sortable  align="left" label="工序" 		prop="工序" 		width="80" />
+				<el-table-column  sortable  align="left" label="验片人" 		prop="验片人" 		width="90" />
+				<el-table-column  sortable  align="left" label="日期" 		prop="日期" 		width="100" />
 			</el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -64,7 +67,6 @@
             </div>
           </div>
 		  
-		  
           <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog" destroy-on-close style="width: 100%; height: 100%;margin: 0%;">
 				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
@@ -80,7 +82,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24">
 					<el-col :span="10">
 						<el-form-item label="生产款号:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -93,7 +94,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24" >
 					<el-col :span="10">
 						<el-form-item label="颜色:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -106,7 +106,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24" >
 					<el-col :span="10">
 						<el-form-item label="组别:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -119,7 +118,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24" >
 					<el-col :span="10">
 						<el-form-item label="尺码:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -132,7 +130,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24" >
 					<el-col :span="10">
 						<el-form-item label="是否尾包:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -148,7 +145,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<el-row :gutter="24" style="margin-bottom: 20px;">
 					<el-col :span="10">
 						<el-form-item label="验片人:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -161,7 +157,6 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-
 				<template #footer>
 					<div class="dialog-footer">
 						<el-button @click="edit_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
@@ -219,26 +214,23 @@
 						   ref="multipleTableRef"
 						   style="width: 100%;height: 40vh"
 						   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"
+						   :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="add_updateCompanyFunc"
-						   @row-click="add_tableRowClick"
-						   @row-contextmenu="handleRightClick"
-						   :show-overflow-tooltip="true"
-						   @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="310"/>
-						  <el-table-column sortable align="left" label="订单号" prop="订单号" width="310"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="380"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="310"/>
-						  <el-table-column sortable align="left" label="颜色" prop="颜色" width="310"/>
+						   @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+						   :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+						<el-table-column type="selection" width="70" />
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 						</el-table>
 				</div>
 		      </el-row>
@@ -246,7 +238,7 @@
 		      <template #footer>
 		          <div class="dialog-footer" >
 		              <el-button 				@click="add_closeDialog" style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
+		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
 					  <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button>
 		          </div>
 		      </template>
@@ -299,17 +291,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '车缝制完成记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -464,6 +453,7 @@ const add_formData = reactive({
   数量: '',
   是否订单尾包: '',
 });
+
 // 新增确定
 const add_Dialog = () => {
    // AttendanceVisible.value = false
@@ -508,14 +498,24 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
 		add_formData['尺码'] = '32'
@@ -550,6 +550,44 @@ const add_onSubmit = async ()=>{
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '是'
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -575,7 +613,7 @@ const add_tableRowClick = async (row) => {
   roww.value = row
 }
 //双击
-const gyupdateCompanyFunc = async (row) => {
+const add_updateCompanyFunc = async (row) => {
 
 }
 //右键
@@ -601,8 +639,15 @@ const add_xpSelectionChange = (selection, type) => {
 
         // 将选中的数据赋值给 printdata
         const selectedRow = selection[0];
-        printdata.value = {
-            emm: selectedRow['订单子编号'],
+		let weibao; 
+		if (add_formData['是否尾包'] === '是') {
+			weibao = 1;
+		} else {
+			weibao = 0;
+		}
+		const ewm = `${selectedRow['订单子编号']},01,${add_formData['尺码']},${add_formData['数量']},${weibao}`;
+		 printdata.value = {
+			emm: ewm,
             zddbh: selectedRow['订单子编号'],
             kh: selectedRow['生产款号'],
             pm: selectedRow['款式'],
@@ -610,7 +655,7 @@ const add_xpSelectionChange = (selection, type) => {
             cm: add_formData['尺码'],
             sl: add_formData['数量'],
             zb: add_formData['组别'],
-            dyrq: currentDate,
+            dyrq: currentDates,
             wb: add_formData['是否订单尾包'],
         };
     }
@@ -668,14 +713,21 @@ const onxiaopiaoclick = async () => {
 		ElMessage({type: 'warning',message: '请选择一条数据' })
 		 return false;
 	}
+		let weibao; 
+		if (row_onclick.value['是否尾包'] === '是') {
+			weibao = 1;
+		} else {
+			weibao = 0;
+		}
+		const ewm = `${row_onclick.value['订单子编号']},01,${row_onclick.value['尺码']},${row_onclick.value['数量']},${weibao}`;
 	printdata.value = {
-	    emm: row_onclick.value['订单子编号'],
+	    emm: ewm,
 	    zddbh: row_onclick.value['订单子编号'],
 	    kh: row_onclick.value['生产款号'],
 	    pm: row_onclick.value['款式'],
 	    ys: row_onclick.value['颜色'],
 	    cm: row_onclick.value['尺码'],
-	    sl: row_onclick.value['数量'],
+	    sl: row_onclick.value['报工数量'],
 	    zb: row_onclick.value['组别'],
 	    dyrq: currentDate,
 	    wb: row_onclick.value['是否尾包'],

+ 13 - 15
src/view/performance/chukubaogong.vue

@@ -7,9 +7,12 @@
           <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
               <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
+              <el-button type="primary" icon="search" @click="onSubmit" 
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -56,9 +59,9 @@
             </div>
           </div>
 
-          <!-- 弹窗 -->
+          <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"  destroy-on-close style="width: 60%; height: 70%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
+				<h1 style="margin: 0%;margin-bottom: 10px;">出库报工修改</h1>
 				<el-row :gutter="24"  style="margin-bottom: 20px;">
 					<el-col :span="10">
 						<el-form-item label="订单号:" prop="deliveryDate" class="mab" label-width="80px" style="font-size: 20px; margin: 10px;">
@@ -129,6 +132,7 @@
 				  <el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="100" style="font-size: 30px;margin: 10px;">
 				      <el-date-picker v-model="add_riqiformData['日期']" type="date" style="width: 150px;height: 40px;"/>
 				  </el-form-item>
+				  
 		      </el-row>
 		      
 		      <el-row :gutter="24" style="margin-bottom: 50px;">
@@ -139,19 +143,16 @@
 		                    size="small" highlight-current-row="true" @row-dblclick="add_updateCompanyFunc"
 		                    @row-click="add_tableRowClick" :show-overflow-tooltip="true"
 		                    @selection-change="handleSelectionChange">
-		              <el-table-column sortable align="center" label="订单号" prop="订单号" width="270"/>
+		              <el-table-column sortable align="left" label="订单号" prop="订单号" width="270"/>
 		              <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="305"/>
 		              <el-table-column sortable align="left" label="款式" prop="款式" width="270"/>
 		              <el-table-column sortable align="left" label="颜色" prop="颜色" width="270"/>
 		          </el-table>
 		      </el-row>
-		      
-		     
-		      
 		      <template #footer>
 		          <div class="dialog-footer">
 		              <el-button @click="add_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
+		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认出库</el-button>
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -246,17 +247,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '出库记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);

+ 195 - 73
src/view/performance/datangbaogong.vue

@@ -3,14 +3,18 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <!--按钮部分-->
+          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
-			   <el-button type="primary" @click="onxiaopiaoclick" style="margin: 5px">补打小票</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;height:40px;"></el-input>
+              <el-button type="primary"  @click="onSubmit"  		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;" icon="search" >查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
+			  <!-- <el-button type="primary"  @click="onxiaopiaoclick" 	
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;background-color: #20a53a;">补打小票</el-button> -->
             </el-form-item>
           </el-form>
         </div>
@@ -21,7 +25,7 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3>大烫报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
 
@@ -33,27 +37,26 @@
 			<el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
 				  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-				  :data="tableData"  border row-key="ID"
-				  size="small" 
+				  :data="tableData"  border row-key="ID" size="small" 
 				  highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 				  @row-click="tableRowClick" :show-overflow-tooltip="true"
 				  @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-				<el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-				<el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-				<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="100" />
-				<el-table-column  sortable  align="left" label="组别" prop="组别" width="110" />
-				<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="是否尾包" width="110" />
-				<el-table-column  sortable  align="left" label="工序" prop="工序" width="80" />
-				<el-table-column  sortable  align="left" label="上报人" prop="验片人" width="90" />
-				<el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+				<!-- <el-table-column type="selection" width="55" /> -->
+				<el-table-column  sortable 	align="center" label="序号" 	prop="序号"  		width="70" />
+				<el-table-column  sortable 	align="left" label="订单子编号" 	prop="订单子编号"  	width="115"/>
+				<el-table-column  sortable  align="left" label="订单号" 		prop="订单号" 		width="115"/>
+				<el-table-column  sortable  align="left" label="生产款号" 	prop="生产款号" 		width="120" />
+				<el-table-column  sortable  align="left" label="款式" 		prop="款式" 		width="100" />
+				<el-table-column  sortable  align="left" label="颜色" 		prop="颜色" 		width="80"  />
+				<el-table-column  sortable  align="left" label="制单总数" 	prop="制单总数" 		width="100" />
+				<el-table-column  sortable  align="left" label="组别" 		prop="组别" 		width="100" />
+				<el-table-column  sortable  align="left" label="排产单数" 	prop="排产单数" 		width="100" />
+				<el-table-column  sortable  align="left" label="尺码" 		prop="尺码" 		width="70" />
+				<el-table-column  sortable  align="left" label="报工数量" 	prop="报工数量" 		width="100" />
+				<el-table-column  sortable  align="left" label="是否尾包" 	prop="是否尾包" 		width="100" />
+				<el-table-column  sortable  align="left" label="工序" 		prop="工序" 		width="80" />
+				<el-table-column  sortable  align="left" label="验片人" 		prop="验片人" 		width="90" />
+				<el-table-column  sortable  align="left" label="日期" 		prop="日期" 		width="100" />
 			</el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -63,10 +66,10 @@
 <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
             </div>
           </div>
-
+		  
           <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog" destroy-on-close style="width: 100%; height: 100%;margin: 0%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
+				<h1 style="margin: 0%;margin-bottom: 10px;">后道(手工确认)修改</h1>
 				<el-row :gutter="24">
 					<el-col :span="10">
 						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -164,7 +167,7 @@
 
 		 <!-- 新增弹窗 -->
 		  <el-dialog v-model="AttendanceVisible"  destroy-on-close style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">工序报工</h1>
+			  <h1 style="margin: 0%;margin-bottom: 10px;">大烫报工</h1>
 			  <el-row :gutter="24" style="margin-bottom: 15px;">
 			      <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
@@ -185,7 +188,7 @@
 				  <el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="100">
 					  <el-input v-model="add_formData['人员']" style="width: 120px;height: 40px;" id="人员" />
 				  </el-form-item>
-
+			
 				  <el-form-item label="尺码:" prop="joinDate" style="font-size: 30px;" label-width="110">
 					<el-select v-model="add_formData['尺码']" style="width: 120px;" id="尺码">
 					  <el-option label="32" value="32"></el-option>
@@ -196,7 +199,7 @@
 					</el-select>
 				</el-form-item>
 				 <el-form-item label="数量:" prop="joinDate" style="font-size: 30px;"  label-width="110">
-					<el-input v-model="add_formData['数量']" style="width: 120px;height: 40px;" id="人员" />
+					<el-input v-model="add_formData['数量']" style="width: 150px;height: 40px;" id="人员" />
 				</el-form-item>
 				<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px;"  label-width="150">
 					<el-select v-model="add_formData['是否订单尾包']" style="width: 120px;height: 40px;" id="尺码" @change="wbSelectChange">
@@ -205,41 +208,67 @@
 					</el-select>
 				  </el-form-item>
 			  </el-row>
-		      <el-row :gutter="24" style="margin-bottom: 15px;">
+		      <el-row :gutter="24" style="margin-bottom: 10px;">
 				  <div @contextmenu.prevent>
 					   <el-table
 						   ref="multipleTableRef"
 						   style="width: 100%;height: 40vh"
 						   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"
+						   :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="add_updateCompanyFunc"
-						   @row-click="add_tableRowClick"
-						   @row-contextmenu="handleRightClick"
-						   :show-overflow-tooltip="true"
-						   @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="310"/>
-						  <el-table-column sortable align="left" label="订单号" prop="订单号" width="310"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="380"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="310"/>
-						  <el-table-column sortable align="left" label="颜色" prop="颜色" width="310"/>
+						   @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+						   :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+						<el-table-column type="selection" width="70" />
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 						</el-table>
 				</div>
 		      </el-row>
 			  
+			   <el-row :gutter="24" style="margin-bottom: 10px;">
+				   <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px">
+				       <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-form-item>
+			  </el-row>
+			  
+			  
+			  <el-row :gutter="24">
+			      <el-form-item label="数量:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+			          <el-input v-model="scsformdata.scs1" disabled style="width: 90px;height: 40px;" id="scs1"/>
+			          <el-input v-model="scsformdata.scs2" disabled style="width: 90px;height: 40px;" id="scs2"/>
+			          <el-input v-model="scsformdata.scs3" disabled style="width: 90px;height: 40px;" id="scs3"/>
+			          <el-input v-model="scsformdata.scs4" disabled style="width: 90px;height: 40px;" id="scs4"/>
+			          <el-input v-model="scsformdata.scs5" disabled style="width: 90px;height: 40px;" id="scs5"/>
+			          <el-input v-model="scsformdata.scs6" disabled style="width: 90px;height: 40px;" id="scs6"/>
+			          <el-input v-model="scsformdata.scs7" disabled style="width: 90px;height: 40px;" id="scs7"/>
+			          <el-input v-model="scsformdata.scs8" disabled style="width: 90px;height: 40px;" id="scs8"/>
+			          <el-input v-model="scsformdata.scs9" disabled style="width: 90px;height: 40px;" id="scs9"/>
+			      </el-form-item>
+			  </el-row>
+			  
 		      <template #footer>
 		          <div class="dialog-footer" >
 		              <el-button 				@click="add_closeDialog" style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
-					  <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button>
+		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					  <!-- <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button> -->
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -291,17 +320,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '大烫报工完成记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -349,13 +375,13 @@ const _getStaffList = async ()=>{
 		      '款式':'连衣裙',
 		      '颜色':'红色',
 			  '制单总数':'90',
-			  '组别':'后道1组',
+			  '组别':'车缝1组',
 			  '排产单数':'50',
 			  '尺码':'32',
 			  '报工数量':'10',
 			  '是否尾包':'否',
 		      '工序':'仓库出库',
-		      '上报人':'xxx',
+		      '验片人':'xxx',
 		      '日期':'2024-07-16'
 		    },
 			{
@@ -366,13 +392,13 @@ const _getStaffList = async ()=>{
 			  '款式':'长袖',
 			  '颜色':'蓝色',
 			  '制单总数':'90',
-			  '组别':'后道2组',
+			  '组别':'车缝2组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -383,13 +409,13 @@ const _getStaffList = async ()=>{
 			  '款式':'西服',
 			  '颜色':'白色',
 			  '制单总数':'90',
-			  '组别':'后道3组',
+			  '组别':'车缝3组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -400,13 +426,13 @@ const _getStaffList = async ()=>{
 			  '款式':'裤子',
 			  '颜色':'黑色',
 			  '制单总数':'90',
-			  '组别':'后道4组',
+			  '组别':'车缝4组',
 			  '排产单数':'40',
 			  '尺码':'36',
 			  '报工数量':'37',
 			  '是否尾包':'是',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 		    
@@ -439,9 +465,6 @@ const onAttendance = () => {
         }
     }, 100); // 延迟100毫秒
 	gd_clearFormData();
-	add_formData['机台号'] = '大烫'
-	add_formData['工序'] = '大烫'
-	add_formData['组别'] = '大烫组'
 	add_formData['人员'] = 'xxx'
 	add_searchInfo.value = ''
 	const WorkListdata = [];
@@ -456,6 +479,30 @@ const add_formData = reactive({
   数量: '',
   是否订单尾包: '',
 });
+// 尺码
+const cmformdata = reactive({
+  cm1:'S',
+  cm2:'M',
+  cm3:'L',
+  cm4:'XL',
+  cm5:'2XL',
+  cm6:'',
+  cm7:'',
+  cm8:'',
+  cm9:'合计',
+});
+// 实裁数
+const scsformdata = reactive({
+  scs1:'',
+  scs2:'',
+  scs3:'',
+  scs4:'',
+  scs5:'',
+  scs6:'',
+  scs7:'',
+  scs8:'',
+  scs9:'',
+});
 // 新增确定
 const add_Dialog = () => {
    // AttendanceVisible.value = false
@@ -500,16 +547,29 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
+		add_formData['机台号'] = '大烫'
+		add_formData['工序'] = '大烫'
+		add_formData['组别'] = '大烫1组'
 		add_formData['尺码'] = '32'
 		add_formData['数量'] = '10'
 		add_formData['是否订单尾包'] = '否'
@@ -524,6 +584,9 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '大烫'
+		add_formData['工序'] = '大烫'
+		add_formData['组别'] = '大烫1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '否'
@@ -538,10 +601,69 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '大烫'
+		add_formData['工序'] = '大烫'
+		add_formData['组别'] = '大烫1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '是'
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		scsformdata['scs1'] = 34
+		scsformdata['scs2'] = 12
+		scsformdata['scs3'] = 53
+		scsformdata['scs4'] = 44
+		scsformdata['scs5'] = 15
+		scsformdata['scs9'] = 158
+		add_formData['机台号'] = '大烫'
+		add_formData['工序'] = '大烫'
+		add_formData['组别'] = '大烫1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		scsformdata['scs1'] = 23
+		scsformdata['scs2'] = 26
+		scsformdata['scs3'] = 48
+		scsformdata['scs4'] = 67
+		scsformdata['scs5'] = 12
+		scsformdata['scs9'] = 176
+		add_formData['机台号'] = '大烫'
+		add_formData['工序'] = '大烫'
+		add_formData['组别'] = '大烫1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -567,7 +689,7 @@ const add_tableRowClick = async (row) => {
   roww.value = row
 }
 //双击
-const gyupdateCompanyFunc = async (row) => {
+const add_updateCompanyFunc = async (row) => {
 
 }
 //右键
@@ -602,7 +724,7 @@ const add_xpSelectionChange = (selection, type) => {
             cm: add_formData['尺码'],
             sl: add_formData['数量'],
             zb: add_formData['组别'],
-            dyrq: currentDate,
+            dyrq: currentDates,
             wb: add_formData['是否订单尾包'],
         };
     }

+ 197 - 74
src/view/performance/houdaoshougong.vue

@@ -3,14 +3,18 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <!--按钮部分-->
+          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
-			   <el-button type="primary" @click="onxiaopiaoclick" style="margin: 5px">补打小票</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;height:40px;"></el-input>
+              <el-button type="primary"  @click="onSubmit"  		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;" icon="search" >查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
+			  <!-- <el-button type="primary"  @click="onxiaopiaoclick" 	
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;background-color: #20a53a;">补打小票</el-button> -->
             </el-form-item>
           </el-form>
         </div>
@@ -21,7 +25,7 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3>后道(手工确认)</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
 
@@ -33,27 +37,26 @@
 			<el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
 				  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-				  :data="tableData"  border row-key="ID"
-				  size="small" 
+				  :data="tableData"  border row-key="ID" size="small" 
 				  highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 				  @row-click="tableRowClick" :show-overflow-tooltip="true"
 				  @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-				<el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-				<el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-				<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="100" />
-				<el-table-column  sortable  align="left" label="组别" prop="组别" width="110" />
-				<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="是否尾包" width="110" />
-				<el-table-column  sortable  align="left" label="工序" prop="工序" width="80" />
-				<el-table-column  sortable  align="left" label="上报人" prop="验片人" width="90" />
-				<el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+				<!-- <el-table-column type="selection" width="55" /> -->
+				<el-table-column  sortable 	align="center" label="序号" 	prop="序号"  		width="70" />
+				<el-table-column  sortable 	align="left" label="订单子编号" 	prop="订单子编号"  	width="115"/>
+				<el-table-column  sortable  align="left" label="订单号" 		prop="订单号" 		width="115"/>
+				<el-table-column  sortable  align="left" label="生产款号" 	prop="生产款号" 		width="120" />
+				<el-table-column  sortable  align="left" label="款式" 		prop="款式" 		width="100" />
+				<el-table-column  sortable  align="left" label="颜色" 		prop="颜色" 		width="80"  />
+				<el-table-column  sortable  align="left" label="制单总数" 	prop="制单总数" 		width="100" />
+				<el-table-column  sortable  align="left" label="组别" 		prop="组别" 		width="100" />
+				<el-table-column  sortable  align="left" label="排产单数" 	prop="排产单数" 		width="100" />
+				<el-table-column  sortable  align="left" label="尺码" 		prop="尺码" 		width="70" />
+				<el-table-column  sortable  align="left" label="报工数量" 	prop="报工数量" 		width="100" />
+				<el-table-column  sortable  align="left" label="是否尾包" 	prop="是否尾包" 		width="100" />
+				<el-table-column  sortable  align="left" label="工序" 		prop="工序" 		width="80" />
+				<el-table-column  sortable  align="left" label="验片人" 		prop="验片人" 		width="90" />
+				<el-table-column  sortable  align="left" label="日期" 		prop="日期" 		width="100" />
 			</el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -63,10 +66,10 @@
 <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
             </div>
           </div>
-
+		  
           <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog" destroy-on-close style="width: 100%; height: 100%;margin: 0%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
+				<h1 style="margin: 0%;margin-bottom: 10px;">后道(手工确认)修改</h1>
 				<el-row :gutter="24">
 					<el-col :span="10">
 						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -161,10 +164,11 @@
 					</div>
 				</template>
 			</el-dialog>
+
 		 <!-- 新增弹窗 -->
 		  <el-dialog v-model="AttendanceVisible"  destroy-on-close style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">工序报工</h1>
-			  <el-row :gutter="24" style="margin-bottom: 15px;">
+			  <h1 style="margin: 0%;margin-bottom: 10px;">后道(手工确认)工序报工</h1>
+			  <el-row :gutter="24" style="margin-bottom: 10px;">
 			      <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
 							  id="searchInput" 
@@ -184,7 +188,7 @@
 				  <el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="100">
 					  <el-input v-model="add_formData['人员']" style="width: 120px;height: 40px;" id="人员" />
 				  </el-form-item>
-				  
+			
 				  <el-form-item label="尺码:" prop="joinDate" style="font-size: 30px;" label-width="110">
 					<el-select v-model="add_formData['尺码']" style="width: 120px;" id="尺码">
 					  <el-option label="32" value="32"></el-option>
@@ -195,7 +199,7 @@
 					</el-select>
 				</el-form-item>
 				 <el-form-item label="数量:" prop="joinDate" style="font-size: 30px;"  label-width="110">
-					<el-input v-model="add_formData['数量']" style="width: 120px;height: 40px;" id="人员" />
+					<el-input v-model="add_formData['数量']" style="width: 150px;height: 40px;" id="人员" />
 				</el-form-item>
 				<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px;"  label-width="150">
 					<el-select v-model="add_formData['是否订单尾包']" style="width: 120px;height: 40px;" id="尺码" @change="wbSelectChange">
@@ -204,41 +208,67 @@
 					</el-select>
 				  </el-form-item>
 			  </el-row>
-		      <el-row :gutter="24" style="margin-bottom: 15px;">
+		      <el-row :gutter="24" style="margin-bottom: 10px;">
 				  <div @contextmenu.prevent>
 					   <el-table
 						   ref="multipleTableRef"
 						   style="width: 100%;height: 40vh"
 						   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"
+						   :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="add_updateCompanyFunc"
-						   @row-click="add_tableRowClick"
-						   @row-contextmenu="handleRightClick"
-						   :show-overflow-tooltip="true"
-						   @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="310"/>
-						  <el-table-column sortable align="left" label="订单号" prop="订单号" width="310"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="380"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="310"/>
-						  <el-table-column sortable align="left" label="颜色" prop="颜色" width="310"/>
+						   @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+						   :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+						<el-table-column type="selection" width="70" />
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 						</el-table>
 				</div>
 		      </el-row>
 			  
+			   <el-row :gutter="24" style="margin-bottom: 15px;">
+				   <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+				       <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-form-item>
+			  </el-row>
+			  
+			  
+			  <el-row :gutter="24">
+			      <el-form-item label="数量:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+			          <el-input v-model="scsformdata.scs1" disabled style="width: 90px;height: 40px;" id="scs1"/>
+			          <el-input v-model="scsformdata.scs2" disabled style="width: 90px;height: 40px;" id="scs2"/>
+			          <el-input v-model="scsformdata.scs3" disabled style="width: 90px;height: 40px;" id="scs3"/>
+			          <el-input v-model="scsformdata.scs4" disabled style="width: 90px;height: 40px;" id="scs4"/>
+			          <el-input v-model="scsformdata.scs5" disabled style="width: 90px;height: 40px;" id="scs5"/>
+			          <el-input v-model="scsformdata.scs6" disabled style="width: 90px;height: 40px;" id="scs6"/>
+			          <el-input v-model="scsformdata.scs7" disabled style="width: 90px;height: 40px;" id="scs7"/>
+			          <el-input v-model="scsformdata.scs8" disabled style="width: 90px;height: 40px;" id="scs8"/>
+			          <el-input v-model="scsformdata.scs9" disabled style="width: 90px;height: 40px;" id="scs9"/>
+			      </el-form-item>
+			  </el-row>
+			  
 		      <template #footer>
 		          <div class="dialog-footer" >
 		              <el-button 				@click="add_closeDialog" style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
-					  <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button>
+		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					  <!-- <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button> -->
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -290,17 +320,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '后道手工完成记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -348,13 +375,13 @@ const _getStaffList = async ()=>{
 		      '款式':'连衣裙',
 		      '颜色':'红色',
 			  '制单总数':'90',
-			  '组别':'后道1组',
+			  '组别':'车缝1组',
 			  '排产单数':'50',
 			  '尺码':'32',
 			  '报工数量':'10',
 			  '是否尾包':'否',
 		      '工序':'仓库出库',
-		      '上报人':'xxx',
+		      '验片人':'xxx',
 		      '日期':'2024-07-16'
 		    },
 			{
@@ -365,13 +392,13 @@ const _getStaffList = async ()=>{
 			  '款式':'长袖',
 			  '颜色':'蓝色',
 			  '制单总数':'90',
-			  '组别':'后道2组',
+			  '组别':'车缝2组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -382,13 +409,13 @@ const _getStaffList = async ()=>{
 			  '款式':'西服',
 			  '颜色':'白色',
 			  '制单总数':'90',
-			  '组别':'后道3组',
+			  '组别':'车缝3组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -399,13 +426,13 @@ const _getStaffList = async ()=>{
 			  '款式':'裤子',
 			  '颜色':'黑色',
 			  '制单总数':'90',
-			  '组别':'后道4组',
+			  '组别':'车缝4组',
 			  '排产单数':'40',
 			  '尺码':'36',
 			  '报工数量':'37',
 			  '是否尾包':'是',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 		    
@@ -438,9 +465,6 @@ const onAttendance = () => {
         }
     }, 100); // 延迟100毫秒
 	gd_clearFormData();
-	add_formData['机台号'] = '手工'
-	add_formData['工序'] = '手工'
-	add_formData['组别'] = '手工组'
 	add_formData['人员'] = 'xxx'
 	add_searchInfo.value = ''
 	const WorkListdata = [];
@@ -455,6 +479,30 @@ const add_formData = reactive({
   数量: '',
   是否订单尾包: '',
 });
+// 尺码
+const cmformdata = reactive({
+  cm1:'S',
+  cm2:'M',
+  cm3:'L',
+  cm4:'XL',
+  cm5:'2XL',
+  cm6:'',
+  cm7:'',
+  cm8:'',
+  cm9:'合计',
+});
+// 实裁数
+const scsformdata = reactive({
+  scs1:'',
+  scs2:'',
+  scs3:'',
+  scs4:'',
+  scs5:'',
+  scs6:'',
+  scs7:'',
+  scs8:'',
+  scs9:'',
+});
 // 新增确定
 const add_Dialog = () => {
    // AttendanceVisible.value = false
@@ -499,16 +547,29 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
+		add_formData['机台号'] = '后道'
+		add_formData['工序'] = '后道'
+		add_formData['组别'] = '后道1组'
 		add_formData['尺码'] = '32'
 		add_formData['数量'] = '10'
 		add_formData['是否订单尾包'] = '否'
@@ -523,6 +584,9 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '后道'
+		add_formData['工序'] = '后道'
+		add_formData['组别'] = '后道1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '否'
@@ -537,10 +601,69 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '后道'
+		add_formData['工序'] = '后道'
+		add_formData['组别'] = '后道1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '是'
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		scsformdata['scs1'] = 34
+		scsformdata['scs2'] = 12
+		scsformdata['scs3'] = 53
+		scsformdata['scs4'] = 44
+		scsformdata['scs5'] = 15
+		scsformdata['scs9'] = 158
+		add_formData['机台号'] = '后道'
+		add_formData['工序'] = '后道'
+		add_formData['组别'] = '后道1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		scsformdata['scs1'] = 23
+		scsformdata['scs2'] = 26
+		scsformdata['scs3'] = 48
+		scsformdata['scs4'] = 67
+		scsformdata['scs5'] = 12
+		scsformdata['scs9'] = 176
+		add_formData['机台号'] = '后道'
+		add_formData['工序'] = '后道'
+		add_formData['组别'] = '后道1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -566,7 +689,7 @@ const add_tableRowClick = async (row) => {
   roww.value = row
 }
 //双击
-const gyupdateCompanyFunc = async (row) => {
+const add_updateCompanyFunc = async (row) => {
 
 }
 //右键
@@ -601,7 +724,7 @@ const add_xpSelectionChange = (selection, type) => {
             cm: add_formData['尺码'],
             sl: add_formData['数量'],
             zb: add_formData['组别'],
-            dyrq: currentDate,
+            dyrq: currentDates,
             wb: add_formData['是否订单尾包'],
         };
     }

+ 195 - 72
src/view/performance/zongjianbaogong.vue

@@ -3,14 +3,18 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <!--按钮部分-->
+          <el-form ref="elSearchFormRef" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 5px">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" style="margin: 5px;float: right;background-color: red">删除</el-button>
-			   <el-button type="primary" @click="onxiaopiaoclick" style="margin: 5px">补打小票</el-button>
+              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;height:40px;"></el-input>
+              <el-button type="primary"  @click="onSubmit"  		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;" icon="search" >查询</el-button>
+			  <el-button type="primary"  @click="onAttendance" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
+              <el-button type="primary"  @click="baogong_del" 		
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
+			  <!-- <el-button type="primary"  @click="onxiaopiaoclick" 	
+			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;background-color: #20a53a;">补打小票</el-button> -->
             </el-form-item>
           </el-form>
         </div>
@@ -21,7 +25,7 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3>总检报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
+            <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
           </div>
         </layout-sider>
 
@@ -33,27 +37,26 @@
 			<el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
 				  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-				  :data="tableData"  border row-key="ID"
-				  size="small" 
+				  :data="tableData"  border row-key="ID" size="small" 
 				  highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 				  @row-click="tableRowClick" :show-overflow-tooltip="true"
 				  @selection-change="handleSelectionChange">
-				<el-table-column type="selection" width="55" />
-				<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-				<el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-				<el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-				<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="100" />
-				<el-table-column  sortable  align="left" label="组别" prop="组别" width="110" />
-				<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="是否尾包" width="110" />
-				<el-table-column  sortable  align="left" label="工序" prop="工序" width="80" />
-				<el-table-column  sortable  align="left" label="上报人" prop="验片人" width="90" />
-				<el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+				<!-- <el-table-column type="selection" width="55" /> -->
+				<el-table-column  sortable 	align="center" label="序号" 	prop="序号"  		width="70" />
+				<el-table-column  sortable 	align="left" label="订单子编号" 	prop="订单子编号"  	width="115"/>
+				<el-table-column  sortable  align="left" label="订单号" 		prop="订单号" 		width="115"/>
+				<el-table-column  sortable  align="left" label="生产款号" 	prop="生产款号" 		width="120" />
+				<el-table-column  sortable  align="left" label="款式" 		prop="款式" 		width="100" />
+				<el-table-column  sortable  align="left" label="颜色" 		prop="颜色" 		width="80"  />
+				<el-table-column  sortable  align="left" label="制单总数" 	prop="制单总数" 		width="100" />
+				<el-table-column  sortable  align="left" label="组别" 		prop="组别" 		width="100" />
+				<el-table-column  sortable  align="left" label="排产单数" 	prop="排产单数" 		width="100" />
+				<el-table-column  sortable  align="left" label="尺码" 		prop="尺码" 		width="70" />
+				<el-table-column  sortable  align="left" label="报工数量" 	prop="报工数量" 		width="100" />
+				<el-table-column  sortable  align="left" label="是否尾包" 	prop="是否尾包" 		width="100" />
+				<el-table-column  sortable  align="left" label="工序" 		prop="工序" 		width="80" />
+				<el-table-column  sortable  align="left" label="验片人" 		prop="验片人" 		width="90" />
+				<el-table-column  sortable  align="left" label="日期" 		prop="日期" 		width="100" />
 			</el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -63,10 +66,10 @@
 <!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
             </div>
           </div>
-
+		  
           <!-- 修改弹窗 -->
 			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog" destroy-on-close style="width: 100%; height: 100%;margin: 0%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">修改</h1>
+				<h1 style="margin: 0%;margin-bottom: 10px;">后道(手工确认)修改</h1>
 				<el-row :gutter="24">
 					<el-col :span="10">
 						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="180" style="font-size: 30px;margin: 10px;">
@@ -164,7 +167,7 @@
 
 		 <!-- 新增弹窗 -->
 		  <el-dialog v-model="AttendanceVisible"  destroy-on-close style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">工序报工</h1>
+			  <h1 style="margin: 0%;margin-bottom: 10px;">总检报工</h1>
 			  <el-row :gutter="24" style="margin-bottom: 15px;">
 			      <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
@@ -185,6 +188,7 @@
 				  <el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="100">
 					  <el-input v-model="add_formData['人员']" style="width: 120px;height: 40px;" id="人员" />
 				  </el-form-item>
+			
 				  <el-form-item label="尺码:" prop="joinDate" style="font-size: 30px;" label-width="110">
 					<el-select v-model="add_formData['尺码']" style="width: 120px;" id="尺码">
 					  <el-option label="32" value="32"></el-option>
@@ -195,7 +199,7 @@
 					</el-select>
 				</el-form-item>
 				 <el-form-item label="数量:" prop="joinDate" style="font-size: 30px;"  label-width="110">
-					<el-input v-model="add_formData['数量']" style="width: 120px;height: 40px;" id="人员" />
+					<el-input v-model="add_formData['数量']" style="width: 150px;height: 40px;" id="人员" />
 				</el-form-item>
 				<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px;"  label-width="150">
 					<el-select v-model="add_formData['是否订单尾包']" style="width: 120px;height: 40px;" id="尺码" @change="wbSelectChange">
@@ -204,41 +208,67 @@
 					</el-select>
 				  </el-form-item>
 			  </el-row>
-		      <el-row :gutter="24" style="margin-bottom: 15px;">
+		      <el-row :gutter="24" style="margin-bottom: 10px;">
 				  <div @contextmenu.prevent>
 					   <el-table
 						   ref="multipleTableRef"
 						   style="width: 100%;height: 40vh"
 						   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"
+						   :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="add_updateCompanyFunc"
-						   @row-click="add_tableRowClick"
-						   @row-contextmenu="handleRightClick"
-						   :show-overflow-tooltip="true"
-						   @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单子编号" prop="订单子编号" width="310"/>
-						  <el-table-column sortable align="left" label="订单号" prop="订单号" width="310"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="380"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="310"/>
-						  <el-table-column sortable align="left" label="颜色" prop="颜色" width="310"/>
+						   @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+						   :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
+						<el-table-column type="selection" width="70" />
+						<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="S" prop="S" width="140"/>
+						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
+						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
+						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
+						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
 						</el-table>
 				</div>
 		      </el-row>
 			  
+			   <el-row :gutter="24" style="margin-bottom: 10px;">
+				   <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+				       <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-form-item>
+			  </el-row>
+			  
+			  
+			  <el-row :gutter="24">
+			      <el-form-item label="数量:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;">
+			          <el-input v-model="scsformdata.scs1" disabled style="width: 90px;height: 40px;" id="scs1"/>
+			          <el-input v-model="scsformdata.scs2" disabled style="width: 90px;height: 40px;" id="scs2"/>
+			          <el-input v-model="scsformdata.scs3" disabled style="width: 90px;height: 40px;" id="scs3"/>
+			          <el-input v-model="scsformdata.scs4" disabled style="width: 90px;height: 40px;" id="scs4"/>
+			          <el-input v-model="scsformdata.scs5" disabled style="width: 90px;height: 40px;" id="scs5"/>
+			          <el-input v-model="scsformdata.scs6" disabled style="width: 90px;height: 40px;" id="scs6"/>
+			          <el-input v-model="scsformdata.scs7" disabled style="width: 90px;height: 40px;" id="scs7"/>
+			          <el-input v-model="scsformdata.scs8" disabled style="width: 90px;height: 40px;" id="scs8"/>
+			          <el-input v-model="scsformdata.scs9" disabled style="width: 90px;height: 40px;" id="scs9"/>
+			      </el-form-item>
+			  </el-row>
+			  
 		      <template #footer>
 		          <div class="dialog-footer" >
 		              <el-button 				@click="add_closeDialog" style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">保存</el-button>
-					  <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button>
+		              <el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+					  <!-- <el-button type="primary" @click="add_printxp"	 style="width: 110px;height: 60px;font-size: 20px;">打印小票</el-button> -->
 		          </div>
 		      </template>
 		  </el-dialog>
@@ -290,17 +320,14 @@ const treeData = ref({})
 const DataListdata = async () => {
   try {
     const data = 
-    [{
-      label : '总检报工完成记录',
-      children : [
+    [
       {label : '2024.7.16'},
       {label : '2024.7.15'},
       {label : '2024.7.14'},
       {label : '2024.7.13'},
       {label : '2024.7.12'},
       {label : '2024.7.11'}
-    ]
-    }];
+    ];
     treeData.value = data
   } catch (error) {
     console.error(error);
@@ -348,13 +375,13 @@ const _getStaffList = async ()=>{
 		      '款式':'连衣裙',
 		      '颜色':'红色',
 			  '制单总数':'90',
-			  '组别':'后道1组',
+			  '组别':'车缝1组',
 			  '排产单数':'50',
 			  '尺码':'32',
 			  '报工数量':'10',
 			  '是否尾包':'否',
 		      '工序':'仓库出库',
-		      '上报人':'xxx',
+		      '验片人':'xxx',
 		      '日期':'2024-07-16'
 		    },
 			{
@@ -365,13 +392,13 @@ const _getStaffList = async ()=>{
 			  '款式':'长袖',
 			  '颜色':'蓝色',
 			  '制单总数':'90',
-			  '组别':'后道2组',
+			  '组别':'车缝2组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -382,13 +409,13 @@ const _getStaffList = async ()=>{
 			  '款式':'西服',
 			  '颜色':'白色',
 			  '制单总数':'90',
-			  '组别':'后道3组',
+			  '组别':'车缝3组',
 			  '排产单数':'60',
 			  '尺码':'35',
 			  '报工数量':'58',
 			  '是否尾包':'否',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 			{
@@ -399,13 +426,13 @@ const _getStaffList = async ()=>{
 			  '款式':'裤子',
 			  '颜色':'黑色',
 			  '制单总数':'90',
-			  '组别':'后道4组',
+			  '组别':'车缝4组',
 			  '排产单数':'40',
 			  '尺码':'36',
 			  '报工数量':'37',
 			  '是否尾包':'是',
 			  '工序':'仓库出库',
-			  '上报人':'xxx',
+			  '验片人':'xxx',
 			  '日期':'2024-07-16'
 			},
 		    
@@ -438,9 +465,6 @@ const onAttendance = () => {
         }
     }, 100); // 延迟100毫秒
 	gd_clearFormData();
-	add_formData['机台号'] = '总检'
-	add_formData['工序'] = '总检'
-	add_formData['组别'] = '总检组'
 	add_formData['人员'] = 'xxx'
 	add_searchInfo.value = ''
 	const WorkListdata = [];
@@ -455,6 +479,30 @@ const add_formData = reactive({
   数量: '',
   是否订单尾包: '',
 });
+// 尺码
+const cmformdata = reactive({
+  cm1:'S',
+  cm2:'M',
+  cm3:'L',
+  cm4:'XL',
+  cm5:'2XL',
+  cm6:'',
+  cm7:'',
+  cm8:'',
+  cm9:'合计',
+});
+// 实裁数
+const scsformdata = reactive({
+  scs1:'',
+  scs2:'',
+  scs3:'',
+  scs4:'',
+  scs5:'',
+  scs6:'',
+  scs7:'',
+  scs8:'',
+  scs9:'',
+});
 // 新增确定
 const add_Dialog = () => {
    // AttendanceVisible.value = false
@@ -499,16 +547,29 @@ const add_onSubmit = async ()=>{
 		      '订单号':'2408001',
 		      '生产款号':'2401-1622款',
 		      '款式':'连衣裙',
-		      '颜色':'红色'
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
 		    },
 			{
 			  '订单子编号':'2408001-2',
 			  '订单号':'2408001',
 			  '生产款号':'2401-1623款',
 			  '款式':'长袖',
-			  '颜色':'蓝色'
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
 			},
 		];
+		add_formData['机台号'] = '总检'
+		add_formData['工序'] = '总检'
+		add_formData['组别'] = '总检1组'
 		add_formData['尺码'] = '32'
 		add_formData['数量'] = '10'
 		add_formData['是否订单尾包'] = '否'
@@ -523,6 +584,9 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '总检'
+		add_formData['工序'] = '总检'
+		add_formData['组别'] = '总检1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '否'
@@ -537,10 +601,69 @@ const add_onSubmit = async ()=>{
 		      '颜色':'白色'
 		    },
 		];
+		add_formData['机台号'] = '总检'
+		add_formData['工序'] = '总检'
+		add_formData['组别'] = '总检1组'
 		add_formData['尺码'] = '35'
 		add_formData['数量'] = '58'
 		add_formData['是否订单尾包'] = '是'
 		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-1'){
+		const WorkListdata = [
+		    {
+			  '订单子编号':'2408001-1',
+		      '订单号':'2408001',
+		      '生产款号':'2401-1622款',
+		      '款式':'连衣裙',
+			  '颜色':'红色',
+		      'S':'34',
+			  'M':'12',
+			  'L':'53',
+			  'XL':'44',
+			  '2XL':'15'
+		    },
+		];
+		scsformdata['scs1'] = 34
+		scsformdata['scs2'] = 12
+		scsformdata['scs3'] = 53
+		scsformdata['scs4'] = 44
+		scsformdata['scs5'] = 15
+		scsformdata['scs9'] = 158
+		add_formData['机台号'] = '总检'
+		add_formData['工序'] = '总检'
+		add_formData['组别'] = '总检1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+	}else if(add_searchInfo.value === '2408001-2'){
+		const WorkListdata = [
+			{
+			  '订单子编号':'2408001-2',
+			  '订单号':'2408001',
+			  '生产款号':'2401-1623款',
+			  '款式':'长袖',
+			  '颜色':'蓝色',
+			  'S':'23',
+			  'M':'26',
+			  'L':'48',
+			  'XL':'67',
+			  '2XL':'12'
+			},
+		];
+		scsformdata['scs1'] = 23
+		scsformdata['scs2'] = 26
+		scsformdata['scs3'] = 48
+		scsformdata['scs4'] = 67
+		scsformdata['scs5'] = 12
+		scsformdata['scs9'] = 176
+		add_formData['机台号'] = '总检'
+		add_formData['工序'] = '总检'
+		add_formData['组别'] = '总检1组'
+		add_formData['尺码'] = '32'
+		add_formData['数量'] = '10'
+		add_formData['是否订单尾包'] = '否'
+		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
 	}
 	setTimeout(() => {
 	    const inputElement = document.querySelector('#searchInput');
@@ -566,7 +689,7 @@ const add_tableRowClick = async (row) => {
   roww.value = row
 }
 //双击
-const gyupdateCompanyFunc = async (row) => {
+const add_updateCompanyFunc = async (row) => {
 
 }
 //右键
@@ -601,7 +724,7 @@ const add_xpSelectionChange = (selection, type) => {
             cm: add_formData['尺码'],
             sl: add_formData['数量'],
             zb: add_formData['组别'],
-            dyrq: currentDate,
+            dyrq: currentDates,
             wb: add_formData['是否订单尾包'],
         };
     }