liuhairui 9 месяцев назад
Родитель
Сommit
9080a605f8

+ 116 - 115
src/view/performance/baozhuangbaogong.vue

@@ -95,122 +95,123 @@
 				</el-row>
 
 				<layout-content >
-					<el-main>
-						<el-row :gutter="24" style="margin-bottom: 15px;">
-							<!-- 表格数据 -->
-							  <el-tabs v-model="activeName">
-								<el-tab-pane label="报工历史记录"   name="first">
-									<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-										: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" tooltip-effect="dark"
-										@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-										:show-overflow-tooltip="true"
-										@selection-change="selectionChange">
-									<el-table-column type="selection" width="60" />
-									<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
-									<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
-									<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
-									<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
-									<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
-									
-
-								<!-- 尺码列表 -->
-							    <el-table-column
-							        v-for="item in sizeDatas"
-							        :key="item"
-							        align="center"
-							        :label="item"
-							        width="100"
-							        :cell-style="cellStyle"
-							    >
-							        <template v-slot="scope">
-							            <div
-							                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
-							                style="margin-left: -5px; width: 80px;"
-							                @click="handleSizeClick(scope.$index, item, scope.row)"
-							            >
-							                {{ scope.row[item] || '—' }} 
-							            </div>
-							        </template>
-							    </el-table-column>
-
-
-									<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
-									<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
-									<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
-									<el-table-column align="left" label="流水号" 	prop="serial" 		 width="100"/>
-									</el-table>
-								</el-tab-pane>
-								
-							 <el-tab-pane label="订单资料附件" name="third">
-							   <el-table ref="multipleTable"
-							 			:row-style="{ height: '30px' }"
-							 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-							 			:header-cell-style="{ padding: '0px' }"
-							 			:show-overflow-tooltip="true"
-							 			:cell-class-name="planUsageCellClass"
-							 			highlight-current-row="true"
-							 			@row-dblclick="gdbomupdateCompanyFunc"
-							 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
-									   @selection-change="fjSelectionChange">
-							    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-							    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-							    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-							    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-							    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								 <el-table-column align="left" label="操作"width="100"fixed="right">
-								   <template #default="scope">
-									 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-								   </template>
-								 </el-table-column>
-							   </el-table>
-							 </el-tab-pane> 
-							 
-							 
-							 <el-tab-pane label="技术附件" name="fourth">
-							 	<el-table ref="multipleTable"
-									  :row-style="{ height: '30px' }"
-									  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-									  :header-cell-style="{ padding: '0px' }"
-									  :show-overflow-tooltip="true"
-									  :cell-class-name="planUsageCellClass"
-									  highlight-current-row="true"
-									  @row-dblclick="ExcelShow"
-									  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
-								  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-								  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-								  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-								  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-								  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								  <el-table-column align="left" label="操作"width="100"fixed="right">
-									<template #default="scope">
-									  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-									</template>
-								  </el-table-column>
-							 	</el-table>
-							   </el-tab-pane>
-							 </el-tabs>
-						</el-row>
-					</el-main>
-				</layout-content>
-					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button  type="danger" icon="delete" @click="del_delclick"
-						  v-if="delall === true" :disabled="Selection === ''"
-						  :style="{
-						    backgroundColor: Selection === '' ? '' : 'red',
-						    borderColor: Selection === '' ? '' : 'red',
-						    color: Selection === '' ? '' : '#fff'
-						  }"
-						  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
-						  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
-						style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							<el-main>
+								<!-- <el-row :gutter="24" style="margin-bottom: 15px;"> -->
+									<!-- 表格数据 -->
+									  <el-tabs v-model="activeName">
+										<el-tab-pane label="报工历史记录"   name="first">
+											<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+												: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" tooltip-effect="dark"
+												@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+												:show-overflow-tooltip="true"
+												@selection-change="selectionChange">
+											<el-table-column type="selection" width="60" />
+											<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
+											<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
+										
+											
+				
+										<!-- 尺码列表 -->
+									    <el-table-column
+									        v-for="item in sizeDatas"
+									        :key="item"
+									        align="center"
+									        :label="item"
+									        width="100"
+									        :cell-style="cellStyle"
+									    >
+									        <template v-slot="scope">
+									            <div
+									                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
+									                style="margin-left: -5px; width: 80px;"
+									                @click="handleSizeClick(scope.$index, item, scope.row)"
+									            >
+									                {{ scope.row[item] || '—' }} 
+									            </div>
+									        </template>
+									    </el-table-column>
+				
+				
+											<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
+											<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
+											<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
+											<el-table-column align="left" label="流水号" 	prop="serial" 		 width="69"/>
+											<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
+											<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
+											<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
+											</el-table>
+										</el-tab-pane>
+										
+									 <el-tab-pane label="订单资料附件" name="third">
+									   <el-table ref="multipleTable"
+									 			:row-style="{ height: '30px' }"
+									 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+									 			:header-cell-style="{ padding: '0px' }"
+									 			:show-overflow-tooltip="true"
+									 			:cell-class-name="planUsageCellClass"
+									 			highlight-current-row="true"
+									 			@row-dblclick="gdbomupdateCompanyFunc"
+									 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
+											   @selection-change="fjSelectionChange">
+									    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+									    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+									    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+									    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+									    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										 <el-table-column align="left" label="操作"width="100"fixed="right">
+										   <template #default="scope">
+											 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+										   </template>
+										 </el-table-column>
+									   </el-table>
+									 </el-tab-pane> 
+									 
+									 
+									 <el-tab-pane label="技术附件" name="fourth">
+									 	<el-table ref="multipleTable"
+											  :row-style="{ height: '30px' }"
+											  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+											  :header-cell-style="{ padding: '0px' }"
+											  :show-overflow-tooltip="true"
+											  :cell-class-name="planUsageCellClass"
+											  highlight-current-row="true"
+											  @row-dblclick="ExcelShow"
+											  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
+										  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+										  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+										  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+										  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+										  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										  <el-table-column align="left" label="操作"width="100"fixed="right">
+											<template #default="scope">
+											  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+											</template>
+										  </el-table-column>
+									 	</el-table>
+									   </el-tab-pane>
+									 </el-tabs>
+								<!-- </el-row> -->
+							</el-main>
+						</layout-content>
+							<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
+								<el-button  type="danger" icon="delete" @click="del_delclick"
+								  v-if="delall === true" :disabled="Selection === ''"
+								  :style="{
+								    backgroundColor: Selection === '' ? '' : 'red',
+								    borderColor: Selection === '' ? '' : 'red',
+								    color: Selection === '' ? '' : '#fff'
+								  }"
+								  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
+								  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
+								<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
+								style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							</div>
 					</div>
-			</div>
-		  <!-- </el-main> -->
-		</layout-content>
+				  <!-- </el-main> -->
+				</layout-content>
 	  </layout>
 	
 	  <!-- PDF预览页面 -->

+ 116 - 115
src/view/performance/datangbaogong.vue

@@ -95,122 +95,123 @@
 				</el-row>
 
 				<layout-content >
-					<el-main>
-						<el-row :gutter="24" style="margin-bottom: 15px;">
-							<!-- 表格数据 -->
-							  <el-tabs v-model="activeName">
-								<el-tab-pane label="报工历史记录"   name="first">
-									<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-										: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" tooltip-effect="dark"
-										@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-										:show-overflow-tooltip="true"
-										@selection-change="selectionChange">
-									<el-table-column type="selection" width="60" />
-									<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
-									<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
-									<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
-									<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
-									<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
-									
-
-								<!-- 尺码列表 -->
-							    <el-table-column
-							        v-for="item in sizeDatas"
-							        :key="item"
-							        align="center"
-							        :label="item"
-							        width="100"
-							        :cell-style="cellStyle"
-							    >
-							        <template v-slot="scope">
-							            <div
-							                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
-							                style="margin-left: -5px; width: 80px;"
-							                @click="handleSizeClick(scope.$index, item, scope.row)"
-							            >
-							                {{ scope.row[item] || '—' }} 
-							            </div>
-							        </template>
-							    </el-table-column>
-
-
-									<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
-									<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
-									<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
-									<el-table-column align="left" label="流水号" 	prop="serial" 		 width="100"/>
-									</el-table>
-								</el-tab-pane>
-								
-							 <el-tab-pane label="订单资料附件" name="third">
-							   <el-table ref="multipleTable"
-							 			:row-style="{ height: '30px' }"
-							 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-							 			:header-cell-style="{ padding: '0px' }"
-							 			:show-overflow-tooltip="true"
-							 			:cell-class-name="planUsageCellClass"
-							 			highlight-current-row="true"
-							 			@row-dblclick="gdbomupdateCompanyFunc"
-							 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
-									   @selection-change="fjSelectionChange">
-							    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-							    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-							    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-							    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-							    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								 <el-table-column align="left" label="操作"width="100"fixed="right">
-								   <template #default="scope">
-									 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-								   </template>
-								 </el-table-column>
-							   </el-table>
-							 </el-tab-pane> 
-							 
-							 
-							 <el-tab-pane label="技术附件" name="fourth">
-							 	<el-table ref="multipleTable"
-									  :row-style="{ height: '30px' }"
-									  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-									  :header-cell-style="{ padding: '0px' }"
-									  :show-overflow-tooltip="true"
-									  :cell-class-name="planUsageCellClass"
-									  highlight-current-row="true"
-									  @row-dblclick="ExcelShow"
-									  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
-								  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-								  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-								  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-								  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-								  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								  <el-table-column align="left" label="操作"width="100"fixed="right">
-									<template #default="scope">
-									  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-									</template>
-								  </el-table-column>
-							 	</el-table>
-							   </el-tab-pane>
-							 </el-tabs>
-						</el-row>
-					</el-main>
-				</layout-content>
-					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button  type="danger" icon="delete" @click="del_delclick"
-						  v-if="delall === true" :disabled="Selection === ''"
-						  :style="{
-						    backgroundColor: Selection === '' ? '' : 'red',
-						    borderColor: Selection === '' ? '' : 'red',
-						    color: Selection === '' ? '' : '#fff'
-						  }"
-						  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
-						  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
-						style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							<el-main>
+								<!-- <el-row :gutter="24" style="margin-bottom: 15px;"> -->
+									<!-- 表格数据 -->
+									  <el-tabs v-model="activeName">
+										<el-tab-pane label="报工历史记录"   name="first">
+											<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+												: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" tooltip-effect="dark"
+												@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+												:show-overflow-tooltip="true"
+												@selection-change="selectionChange">
+											<el-table-column type="selection" width="60" />
+											<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
+											<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
+										
+											
+				
+										<!-- 尺码列表 -->
+									    <el-table-column
+									        v-for="item in sizeDatas"
+									        :key="item"
+									        align="center"
+									        :label="item"
+									        width="100"
+									        :cell-style="cellStyle"
+									    >
+									        <template v-slot="scope">
+									            <div
+									                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
+									                style="margin-left: -5px; width: 80px;"
+									                @click="handleSizeClick(scope.$index, item, scope.row)"
+									            >
+									                {{ scope.row[item] || '—' }} 
+									            </div>
+									        </template>
+									    </el-table-column>
+				
+				
+											<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
+											<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
+											<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
+											<el-table-column align="left" label="流水号" 	prop="serial" 		 width="69"/>
+											<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
+											<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
+											<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
+											</el-table>
+										</el-tab-pane>
+										
+									 <el-tab-pane label="订单资料附件" name="third">
+									   <el-table ref="multipleTable"
+									 			:row-style="{ height: '30px' }"
+									 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+									 			:header-cell-style="{ padding: '0px' }"
+									 			:show-overflow-tooltip="true"
+									 			:cell-class-name="planUsageCellClass"
+									 			highlight-current-row="true"
+									 			@row-dblclick="gdbomupdateCompanyFunc"
+									 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
+											   @selection-change="fjSelectionChange">
+									    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+									    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+									    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+									    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+									    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										 <el-table-column align="left" label="操作"width="100"fixed="right">
+										   <template #default="scope">
+											 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+										   </template>
+										 </el-table-column>
+									   </el-table>
+									 </el-tab-pane> 
+									 
+									 
+									 <el-tab-pane label="技术附件" name="fourth">
+									 	<el-table ref="multipleTable"
+											  :row-style="{ height: '30px' }"
+											  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+											  :header-cell-style="{ padding: '0px' }"
+											  :show-overflow-tooltip="true"
+											  :cell-class-name="planUsageCellClass"
+											  highlight-current-row="true"
+											  @row-dblclick="ExcelShow"
+											  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
+										  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+										  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+										  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+										  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+										  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										  <el-table-column align="left" label="操作"width="100"fixed="right">
+											<template #default="scope">
+											  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+											</template>
+										  </el-table-column>
+									 	</el-table>
+									   </el-tab-pane>
+									 </el-tabs>
+								<!-- </el-row> -->
+							</el-main>
+						</layout-content>
+							<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
+								<el-button  type="danger" icon="delete" @click="del_delclick"
+								  v-if="delall === true" :disabled="Selection === ''"
+								  :style="{
+								    backgroundColor: Selection === '' ? '' : 'red',
+								    borderColor: Selection === '' ? '' : 'red',
+								    color: Selection === '' ? '' : '#fff'
+								  }"
+								  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
+								  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
+								<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
+								style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							</div>
 					</div>
-			</div>
-		  <!-- </el-main> -->
-		</layout-content>
+				  <!-- </el-main> -->
+				</layout-content>
 	  </layout>
 	
 	  <!-- PDF预览页面 -->

+ 7 - 6
src/view/performance/houdaoshougong.vue

@@ -96,7 +96,7 @@
 
 				<layout-content >
 					<el-main>
-						<el-row :gutter="24" style="margin-bottom: 15px;">
+						<!-- <el-row :gutter="24" style="margin-bottom: 15px;"> -->
 							<!-- 表格数据 -->
 							  <el-tabs v-model="activeName">
 								<el-tab-pane label="报工历史记录"   name="first">
@@ -111,9 +111,7 @@
 									<el-table-column type="selection" width="60" />
 									<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
 									<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
-									<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
-									<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
-									<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
+								
 									
 
 								<!-- 尺码列表 -->
@@ -140,7 +138,10 @@
 									<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
 									<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
 									<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
-									<el-table-column align="left" label="流水号" 	prop="serial" 		 width="100"/>
+									<el-table-column align="left" label="流水号" 	prop="serial" 		 width="69"/>
+									<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
+									<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
+									<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
 									</el-table>
 								</el-tab-pane>
 								
@@ -192,7 +193,7 @@
 							 	</el-table>
 							   </el-tab-pane>
 							 </el-tabs>
-						</el-row>
+						<!-- </el-row> -->
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">

+ 116 - 115
src/view/performance/zongjianbaogong.vue

@@ -95,122 +95,123 @@
 				</el-row>
 
 				<layout-content >
-					<el-main>
-						<el-row :gutter="24" style="margin-bottom: 15px;">
-							<!-- 表格数据 -->
-							  <el-tabs v-model="activeName">
-								<el-tab-pane label="报工历史记录"   name="first">
-									<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-										: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" tooltip-effect="dark"
-										@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-										:show-overflow-tooltip="true"
-										@selection-change="selectionChange">
-									<el-table-column type="selection" width="60" />
-									<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
-									<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
-									<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
-									<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
-									<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
-									
-
-								<!-- 尺码列表 -->
-							    <el-table-column
-							        v-for="item in sizeDatas"
-							        :key="item"
-							        align="center"
-							        :label="item"
-							        width="100"
-							        :cell-style="cellStyle"
-							    >
-							        <template v-slot="scope">
-							            <div
-							                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
-							                style="margin-left: -5px; width: 80px;"
-							                @click="handleSizeClick(scope.$index, item, scope.row)"
-							            >
-							                {{ scope.row[item] || '—' }} 
-							            </div>
-							        </template>
-							    </el-table-column>
-
-
-									<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
-									<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
-									<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
-									<el-table-column align="left" label="流水号" 	prop="serial" 		 width="100"/>
-									</el-table>
-								</el-tab-pane>
-								
-							 <el-tab-pane label="订单资料附件" name="third">
-							   <el-table ref="multipleTable"
-							 			:row-style="{ height: '30px' }"
-							 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-							 			:header-cell-style="{ padding: '0px' }"
-							 			:show-overflow-tooltip="true"
-							 			:cell-class-name="planUsageCellClass"
-							 			highlight-current-row="true"
-							 			@row-dblclick="gdbomupdateCompanyFunc"
-							 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
-									   @selection-change="fjSelectionChange">
-							    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-							    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-							    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-							    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-							    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								 <el-table-column align="left" label="操作"width="100"fixed="right">
-								   <template #default="scope">
-									 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-								   </template>
-								 </el-table-column>
-							   </el-table>
-							 </el-tab-pane> 
-							 
-							 
-							 <el-tab-pane label="技术附件" name="fourth">
-							 	<el-table ref="multipleTable"
-									  :row-style="{ height: '30px' }"
-									  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-									  :header-cell-style="{ padding: '0px' }"
-									  :show-overflow-tooltip="true"
-									  :cell-class-name="planUsageCellClass"
-									  highlight-current-row="true"
-									  @row-dblclick="ExcelShow"
-									  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
-								  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-								  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-								  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-								  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-								  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-								  <el-table-column align="left" label="操作"width="100"fixed="right">
-									<template #default="scope">
-									  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-									</template>
-								  </el-table-column>
-							 	</el-table>
-							   </el-tab-pane>
-							 </el-tabs>
-						</el-row>
-					</el-main>
-				</layout-content>
-					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button  type="danger" icon="delete" @click="del_delclick"
-						  v-if="delall === true" :disabled="Selection === ''"
-						  :style="{
-						    backgroundColor: Selection === '' ? '' : 'red',
-						    borderColor: Selection === '' ? '' : 'red',
-						    color: Selection === '' ? '' : '#fff'
-						  }"
-						  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
-						  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
-						<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
-						style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							<el-main>
+								<!-- <el-row :gutter="24" style="margin-bottom: 15px;"> -->
+									<!-- 表格数据 -->
+									  <el-tabs v-model="activeName">
+										<el-tab-pane label="报工历史记录"   name="first">
+											<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+												: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" tooltip-effect="dark"
+												@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+												:show-overflow-tooltip="true"
+												@selection-change="selectionChange">
+											<el-table-column type="selection" width="60" />
+											<el-table-column align="left" label="报工时间"	prop="sys_rq"  		width="150"/>
+											<el-table-column align="left" label="子订单编号" prop="子订单编号"  	width="130"/>
+										
+											
+				
+										<!-- 尺码列表 -->
+									    <el-table-column
+									        v-for="item in sizeDatas"
+									        :key="item"
+									        align="center"
+									        :label="item"
+									        width="100"
+									        :cell-style="cellStyle"
+									    >
+									        <template v-slot="scope">
+									            <div
+									                :class="{ 'highlight-cell': isCellHighlighted(scope.$index, item) }"
+									                style="margin-left: -5px; width: 80px;"
+									                @click="handleSizeClick(scope.$index, item, scope.row)"
+									            >
+									                {{ scope.row[item] || '—' }} 
+									            </div>
+									        </template>
+									    </el-table-column>
+				
+				
+											<el-table-column align="left" label="数量" 		prop="数量"  		width="100"/>
+											<el-table-column align="left" label="剩余数量" 	prop="剩余数量"  	width="85"/>
+											<el-table-column align="left" label="尾包" 		prop="尾包"  		width="60"/>
+											<el-table-column align="left" label="流水号" 	prop="serial" 		 width="69"/>
+											<el-table-column align="left" label="订单款号" 	prop="款号"  	width="120"/>
+											<el-table-column align="left" label="款式" 		prop="款式"  		width="100"/>
+											<el-table-column align="left" label="组别" 		prop="组别"  		width="80"/>
+											</el-table>
+										</el-tab-pane>
+										
+									 <el-tab-pane label="订单资料附件" name="third">
+									   <el-table ref="multipleTable"
+									 			:row-style="{ height: '30px' }"
+									 			:cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+									 			:header-cell-style="{ padding: '0px' }"
+									 			:show-overflow-tooltip="true"
+									 			:cell-class-name="planUsageCellClass"
+									 			highlight-current-row="true"
+									 			@row-dblclick="gdbomupdateCompanyFunc"
+									 			style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
+											   @selection-change="fjSelectionChange">
+									    <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+									    <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+									    <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+									    <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+									    <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										 <el-table-column align="left" label="操作"width="100"fixed="right">
+										   <template #default="scope">
+											 <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+										   </template>
+										 </el-table-column>
+									   </el-table>
+									 </el-tab-pane> 
+									 
+									 
+									 <el-tab-pane label="技术附件" name="fourth">
+									 	<el-table ref="multipleTable"
+											  :row-style="{ height: '30px' }"
+											  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
+											  :header-cell-style="{ padding: '0px' }"
+											  :show-overflow-tooltip="true"
+											  :cell-class-name="planUsageCellClass"
+											  highlight-current-row="true"
+											  @row-dblclick="ExcelShow"
+											  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
+										  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+										  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
+										  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+										  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+										  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
+										  <el-table-column align="left" label="操作"width="100"fixed="right">
+											<template #default="scope">
+											  <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
+											</template>
+										  </el-table-column>
+									 	</el-table>
+									   </el-tab-pane>
+									 </el-tabs>
+								<!-- </el-row> -->
+							</el-main>
+						</layout-content>
+							<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
+								<el-button  type="danger" icon="delete" @click="del_delclick"
+								  v-if="delall === true" :disabled="Selection === ''"
+								  :style="{
+								    backgroundColor: Selection === '' ? '' : 'red',
+								    borderColor: Selection === '' ? '' : 'red',
+								    color: Selection === '' ? '' : '#fff'
+								  }"
+								  style="width: 110px;height: 60px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
+								  <el-button type="primary" @click="gd_yulan" 	 style="width: 130px;height: 60px;font-size: 20px;">子订单详情页</el-button>
+								<el-button type="primary" @click="add_Dialog" id="add_Dialog"	:disabled="add_Dialogonclick === false"  
+								style="width: 110px;height: 60px;font-size: 20px;margin-left: 20px;">报工</el-button>
+							</div>
 					</div>
-			</div>
-		  <!-- </el-main> -->
-		</layout-content>
+				  <!-- </el-main> -->
+				</layout-content>
 	  </layout>
 	
 	  <!-- PDF预览页面 -->