liuhairui il y a 1 an
Parent
commit
34e17e6e7c

+ 245 - 182
src/view/performance/baozhuangbaogong.vue

@@ -7,9 +7,9 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">{{_code}}报工</h1>
 				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
 					<!-- 子订单编号输入框 -->
-					<el-col :span="4"  style="padding: 0px;margin: 0px;">
-					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
-					</el-col>
+					<!-- <el-col :span="5"  style="padding: 0px;margin: 0px;"> -->
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 295px; height: 50px;"/>
+					<!-- </el-col> -->
 				
 					<!-- 查询按钮 -->
 					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
@@ -46,26 +46,28 @@
 						<el-text style="font-size: 30px;">尺码</el-text>
 					</el-col>
 					<!-- 尺码输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<!-- &nbsp;&nbsp;&nbsp;
+					<p style="font-size: 24px;color: red;">{{add_formData['尺码']}}</p>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">总数量</el-text>
 					</el-col>
 					<!-- 总数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">剩余数量</el-text>
 					</el-col>
 					<!--剩余数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 						
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 100%; height: 40px;"/></el-col>
-						
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 80%; height: 40px;"/></el-col>
 				
 					<!-- 是否尾包文本 -->
 					<el-col :span="2.5">
@@ -106,65 +108,75 @@
 										: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="add_xpSelectionChange">
-									<!-- <el-table-column type="selection" width="70" /> -->
-									<el-table-column sortable align="left" label="流水号" prop="serial" width="100"/>
-									<el-table-column sortable align="left" label="报工时间" prop="sys_rq" width="160"/>
-									<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="130"/>
-									<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="130"/>
-									<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="110"/>
-									<el-table-column sortable align="left" label="是否尾包" prop="尾包" width="130"/>
-									<!-- <el-table-column sortable align="left" label="组别" prop="组别" width="130"/> -->
+										: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 align="left" label="尺码" 		prop="尺码"  		width="70"/>
+									<el-table-column align="left" label="数量" 		prop="数量"  		width="70"/>
+									<el-table-column align="left" label="上报数量" 	prop="次品数量"  	width="85"/>
+									<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>
-							</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="handleSelectionChange">
-								 <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>
-							    </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>
+							 </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="handleSelectionChange">
+							 	 <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>
+							     </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="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-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">订单表预览</el-button>
+						<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: 100px;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>
 		  <!-- </el-main> -->
@@ -235,7 +247,7 @@ import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh } from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel } from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -263,12 +275,12 @@ const printPageRef = ref()
 
 //全局获取code,接口接收code
 const _code = '包装'
+//全局获取工序
+const _gx = '7'
 //全局接口接受的物理地址
 const Machine = ref('')
 //全局获取UniqId
 const UniqId = ref('')
-//全局获取工序
-const _gx = '7'
 //全局获取工序名称
 const _gxmc = _code
 const add_formData = reactive({
@@ -379,7 +391,11 @@ const add_onSubmit = async ()=>{
 	 _order.value = add_searchInfo.value;
 	 //获取下面报工历史记录
 	 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:add_formData['机台号']});
-	 console.log(getSpotLists)
+	 cconsole.log("getSpotLists.data.result.ci_num::",getSpotLists.data.result.ci_num)
+	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
+		 ElMessage({type: 'error',message: '已上报,无需再次报工' })
+		 add_searchInfo.value = ''
+	 }
 	 if(getSpotLists.data === null){
 		 add_searchInfo.value = ''
 		 add_formData['尺码'] = ''
@@ -410,98 +426,155 @@ const add_onSubmit = async ()=>{
 }
 //订单资料excel展示
 const gdbomupdateCompanyFunc = (row) =>{
-	const { url } = row
-	const excelPath = `/${url.replace(/\\/g,"/")}`
-	const excelName = excelPath.split('/').pop()
-	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
-			$script('/luckysheet/luckysheet.umd.js', () => {
-			luckyexcelVisible.value = true
-			LuckyExcel.transformExcelToLuckyByUrl(
-				excelPath,
-				excelName,
-				function(exportJson, luckysheetfile){
-					if(exportJson.sheets==null || exportJson.sheets.length==0){
-						alert("Failed to read the content of the excel file, currently does not support xls files!");
-						return;
-					}
-					if(luckyExcel) luckyExcel.destroy();
-					luckysheet.create({
-						container: 'luckyexcel', //容器的ID
-						data: exportJson.sheets,
-						title: exportJson.info.name, // 工作簿名称
-						lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
-						showtoolbar: false, // 是否显示工具栏
-						showinfobar: false, // 是否显示顶部信息栏
-						allowEdit: false, // 是否允许前台编辑
-						enableAddRow: false, // 允许增加行
-						enableAddCol: false, // 允许增加列
-						userInfo: false, // 右上角的用户信息展示样式
-						showRowBar: false, // 是否显示行号区域
-						showColumnBar: false, // 是否显示列号区域
-						sheetFormulaBar: false, // 是否显示公式栏
-						enableAddBackTop: false,//返回头部按钮
-					});
-					luckyExcel = luckysheet;
-			})
-		})
-		})
-		$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
-		$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
-		$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
-		$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
+// 加载插件和样式
+	const loadScriptsAndStyles = () => {
+	    $.getScript('/luckysheet/plugins/js/plugin.js', () => {
+	        $script('/luckysheet/luckysheet.umd.js', () => {
+	            initializeLuckysheet();
+	        });
+	    });
+	
+	    const styles = [
+	        '/luckysheet/plugins/css/pluginsCss.css',
+	        '/luckysheet/plugins/plugins.css',
+	        '/luckysheet/css/luckysheet.css',
+	        '/luckysheet/assets/iconfont/iconfont.css'
+	    ];
+	
+	    styles.forEach(style => {
+	        $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', style));
+	    });
+	};
+	
+	// 初始化 Luckysheet
+	const initializeLuckysheet = () => {
+	    const callback = (exportJson, luckysheetfile) => {
+	        if (!exportJson.sheets || exportJson.sheets.length === 0) {
+	            alert("Failed to read the content of the excel file, currently does not support xls files!");
+	            return;
+	        }
+	        if (luckyExcel) luckyExcel.destroy();
+	        luckysheet.create({
+	            container: 'luckyexcel',
+	            data: exportJson.sheets,
+	            title: exportJson.info.name,
+	            lang: "zh",
+	            showtoolbar: false,
+	            showinfobar: false,
+	            allowEdit: false,
+	            enableAddRow: false,
+	            enableAddCol: false,
+	            userInfo: false,
+	            showRowBar: false,
+	            showColumnBar: false,
+	            sheetFormulaBar: false,
+	            enableAddBackTop: false,
+	        });
+	        luckyExcel = luckysheet;
+	    };
+	
+	    if (row['url'] === null || row['url'] === '') {
+	        const blob = dataURLtoBlob(row.附件内容);
+	        luckyexcelVisible.value = true;
+	        LuckyExcel.transformExcelToLucky(blob, callback);
+	    } else {
+	        const excelPath = `/${row.url.replace(/\\/g, "/")}`;
+	        const excelName = excelPath.split('/').pop();
+	        luckyexcelVisible.value = true;
+	        LuckyExcel.transformExcelToLuckyByUrl(excelPath, excelName, callback);
+	    }
+	};
+	
+	// Data URL 转 Blob
+	const dataURLtoBlob = (dataUrl) => {
+	    const byteString = atob(dataUrl.split(',')[1]);
+	    const ab = new ArrayBuffer(byteString.length);
+	    const ia = new Uint8Array(ab);
+	
+	    for (let i = 0; i < byteString.length; i++) {
+	        ia[i] = byteString.charCodeAt(i);
+	    }
+	
+	    return new Blob([ab], { type: 'application/octet-stream' });
+	};
+	
+	loadScriptsAndStyles();
 }
 //技术资料excel展示
 const ExcelShow = (row) =>{
-	console.log("技术资料excel展示")
-	console.log(row)
-	if(!row.附件内容) return
-	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
-		$script('/luckysheet/luckysheet.umd.js', () => {
-					function dataURLtoBlob(dataUrl) {
-					    const byteString = atob(dataUrl.split(',')[1]);
-					    const ab = new ArrayBuffer(byteString.length);
-					    const ia = new Uint8Array(ab);
-
-					    for (let i = 0; i < byteString.length; i++) {
-					        ia[i] = byteString.charCodeAt(i);
-					    }
-
-					    return new Blob([ab], { type: 'application/octet-stream' });
-					}
-
-					const blob = dataURLtoBlob(row.附件内容);
-					luckyexcelVisible.value = true
-					LuckyExcel.transformExcelToLucky(blob, function(exportJson, luckysheetfile){
-						if(exportJson.sheets==null || exportJson.sheets.length==0){
-							alert("Failed to read the content of the excel file, currently does not support xls files!");
-							return;
-						}
-						if(luckyExcel) luckyExcel.destroy();
-						luckysheet.create({
-							container: 'luckyexcel', //容器的ID
-							data: exportJson.sheets,
-							title: exportJson.info.name, // 工作簿名称
-							lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
-							showtoolbar: false, // 是否显示工具栏
-							showinfobar: false, // 是否显示顶部信息栏
-							allowEdit: false, // 是否允许前台编辑
-							enableAddRow: false, // 允许增加行
-							enableAddCol: false, // 允许增加列
-							userInfo: false, // 右上角的用户信息展示样式
-							showRowBar: false, // 是否显示行号区域
-							showColumnBar: false, // 是否显示列号区域
-							sheetFormulaBar: false, // 是否显示公式栏
-							enableAddBackTop: false,//返回头部按钮
-						});
-						luckyExcel = luckysheet;
-					})
-		})
-	})
-	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
-	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
-	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
-	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
-
+	// 加载插件和样式
+	const loadScriptsAndStyles = () => {
+	    $.getScript('/luckysheet/plugins/js/plugin.js', () => {
+	        $script('/luckysheet/luckysheet.umd.js', () => {
+	            initializeLuckysheet();
+	        });
+	    });
+	
+	    const styles = [
+	        '/luckysheet/plugins/css/pluginsCss.css',
+	        '/luckysheet/plugins/plugins.css',
+	        '/luckysheet/css/luckysheet.css',
+	        '/luckysheet/assets/iconfont/iconfont.css'
+	    ];
+	
+	    styles.forEach(style => {
+	        $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', style));
+	    });
+	};
+	
+	// 初始化 Luckysheet
+	const initializeLuckysheet = () => {
+	    const callback = (exportJson, luckysheetfile) => {
+	        if (!exportJson.sheets || exportJson.sheets.length === 0) {
+	            alert("Failed to read the content of the excel file, currently does not support xls files!");
+	            return;
+	        }
+	        if (luckyExcel) luckyExcel.destroy();
+	        luckysheet.create({
+	            container: 'luckyexcel',
+	            data: exportJson.sheets,
+	            title: exportJson.info.name,
+	            lang: "zh",
+	            showtoolbar: false,
+	            showinfobar: false,
+	            allowEdit: false,
+	            enableAddRow: false,
+	            enableAddCol: false,
+	            userInfo: false,
+	            showRowBar: false,
+	            showColumnBar: false,
+	            sheetFormulaBar: false,
+	            enableAddBackTop: false,
+	        });
+	        luckyExcel = luckysheet;
+	    };
+	
+	    if (row['url'] === null || row['url'] === '') {
+	        const blob = dataURLtoBlob(row.附件内容);
+	        luckyexcelVisible.value = true;
+	        LuckyExcel.transformExcelToLucky(blob, callback);
+	    } else {
+	        const excelPath = `/${row.url.replace(/\\/g, "/")}`;
+	        const excelName = excelPath.split('/').pop();
+	        luckyexcelVisible.value = true;
+	        LuckyExcel.transformExcelToLuckyByUrl(excelPath, excelName, callback);
+	    }
+	};
+	
+	// Data URL 转 Blob
+	const dataURLtoBlob = (dataUrl) => {
+	    const byteString = atob(dataUrl.split(',')[1]);
+	    const ab = new ArrayBuffer(byteString.length);
+	    const ia = new Uint8Array(ab);
+	
+	    for (let i = 0; i < byteString.length; i++) {
+	        ia[i] = byteString.charCodeAt(i);
+	    }
+	
+	    return new Blob([ab], { type: 'application/octet-stream' });
+	};
+	
+	loadScriptsAndStyles();
 }
 
 let luckyExcel = null
@@ -568,48 +641,20 @@ console.log(UniqId.value)
 		params.s_num = add_formData['上报数量']
 		params.ci_num = add_formData['剩余数量']
 		console.log(params)
-		
-		// 记录每一次上报数据信息日志
-			// let datalog = {};
-			// datalog.code = _code;
-			// datalog.订单编号 = _list.value.订单编号;
-			// datalog.子订单编号 = _list.value.order;
-			// datalog.款号 = _list.value.生产款号;
-			// datalog.款式 = _list.value.款式;
-			// datalog.颜色 = _list.value.颜色;
-			// datalog.上报时间 = currentDate;
-			// datalog.上报数量 = add_formData['上报数量'];
-			// // 记录总实裁数
-			// datalog.sctotal = _list.value.sctotal;
-			// datalog.zdtotal = _list.value.zdtotal;
-			// datalog['组别'] = add_formData['组别'];
-			
-			// console.log(_list)
-			// console.log(datalog)
-			// const getTabByGdbhs = await getTabByGdbh(datalog);
-		// return false;
 		const cf_gettab = await search(params); // 调用search函数  
 		if (cf_gettab.code === 0) {
-			// const firstPart = add_searchInfo.value.split(',')[0];  
-			//上报后历史记录表格刷新
-			const lsjltable = await getTab({order_id:_order.value.split(',')[0],sczl_jtbh:add_formData['机台号']}); 
-			add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
-			// //上报后刷新表格数据
-			// const getSpotLists = await getSpotList({order:_order.value.split(',')[0],code:_code,sys_sbID:sys_sbID});
-			// add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
+			add_onSubmit();
 			add_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
 				if (inputElement) {
 					inputElement.focus();		
 				}
-			}, 100); // 延迟100毫秒
-			// searcs.value = '';
+			}, 100); 
 			add_formData['尺码']=''
 			add_formData['总数量']=''
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
-		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
@@ -691,6 +736,24 @@ const table_selectrows = ref([]);
 const table_SelectionChange = (val) => {
   table_selectrows.value = val; // 将选中的行数据保存到 table_selectrows
 }
+
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+  console.log(selection)
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
   
  
 // =========== 分页 ===========

+ 105 - 49
src/view/performance/caiqiebaogong.vue

@@ -44,53 +44,58 @@
 			  
 					<el-row :gutter="0">
 						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 90px;">尺 码</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm1" id="cm1" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm2" id="cm2" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm3" id="cm3" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm1" id="cm1" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm2" id="cm2" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm3" id="cm3" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 80px;height: 40px;" /></el-col>
+						<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:104px;height: 50px; font-size: 20px;margin: 0px 10px 10px 60px">删除报工</el-button>
 					</el-row>
 					
 
 					<el-row :gutter="0">
 						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 70px;">制单数</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl1" id="zdsc1" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl2" id="zdsc2" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl3" id="zdsc3" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl4" id="zdsc4" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl5" id="zdsc5" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl6" id="zdsc6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl7" id="zdsc7" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl8" id="zdsc8" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl9" id="zdsc9" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl10" id="zdsc10" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="cmslformdata.zdtotal" id="zdtotal" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl1" id="zdsc1" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl2" id="zdsc2" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl3" id="zdsc3" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl4" id="zdsc4" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl5" id="zdsc5" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl6" id="zdsc6" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl7" id="zdsc7" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl8" id="zdsc8" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl9" id="zdsc9" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="cmslformdata.cmsl10" id="zdsc10" readonly style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="cmslformdata.zdtotal" id="zdtotal" readonly style="width: 80px;height: 40px;" /></el-col>
+						<el-button type="primary" @click="gd_yulan" style="width: 100px;height: 55px;font-size: 20px;margin: 0px 10px 10px 60px">订单表预览</el-button>
 					</el-row>
 					
 					<el-row :gutter="0">
 						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 10px;">新增实裁数</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs1" @input="updateTotal" id="scs1"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs2" @input="updateTotal" id="scs2"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs3" @input="updateTotal" id="scs3"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs4" @input="updateTotal" id="scs4"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs5" @input="updateTotal" id="scs5"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs6" @input="updateTotal" id="scs6"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs7" @input="updateTotal" id="scs7"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs8" @input="updateTotal" id="scs8"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs9" @input="updateTotal" id="scs9"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs10" @input="updateTotal" id="scs10"  style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="scsformdata.sctotal" id="sctotal" readonly style="width: 65px;height: 40px;" /></el-col>
-						
-						<el-button type="primary" @click="add_Dialog"
-							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 20px">报工</el-button>
-						<el-button type="primary" @click="gd_yulan"
-							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 15px">工单预览</el-button>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs1" @input="updateTotal" id="scs1"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs2" @input="updateTotal" id="scs2"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs3" @input="updateTotal" id="scs3"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs4" @input="updateTotal" id="scs4"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs5" @input="updateTotal" id="scs5"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs6" @input="updateTotal" id="scs6"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs7" @input="updateTotal" id="scs7"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs8" @input="updateTotal" id="scs8"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs9" @input="updateTotal" id="scs9"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding: 0px;margin: 0px;"><el-input v-model="scsformdata.scs10" @input="updateTotal" id="scs10"  style="width: 70px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="scsformdata.sctotal" id="sctotal" readonly style="width: 80px;height: 40px;" /></el-col>
+						<el-button type="primary" @click="add_Dialog"style="width: 100px;height: 50px;font-size: 20px;margin: 0px 0 0 60px">报工</el-button>
 					</el-row>
 					
 					
@@ -99,7 +104,29 @@
 		      <el-main>
 					<!-- 表格数据 -->
 					  <el-tabs v-model="activeName">
-						<el-tab-pane label="产量进度汇总记录"   @click="showTable('产量进度汇总记录')" name="first">
+						  <el-tab-pane label="报工历史记录"   @click="showTable('报工历史记录')" name="first">
+						  	<el-table ref="multipleTable" style="width: 100%;height: 52vh" tooltip-effect="dark"
+						  	          :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+						  	          :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+						  	          :data="bgjdhz_tableData"  border row-key="ID"
+						  	          size="small" 
+						  			  show-summary  :summary-method="getSummaries"
+						  	          highlight-current-row="true" @row-dblclick="updateCompanyFunc"
+						  	          @row-click="tableRowClick" :show-overflow-tooltip="true"
+						  	          @selection-change="selectionChange">
+						  	          <el-table-column type="selection" width="60" />
+						  	          <el-table-column align="left" label="报工时间"	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="sczl_jtbh"  		width="80"/>
+						  	          <el-table-column align="left" label="尺码" 		prop="尺码"  		width="70"/>
+						  	          <el-table-column align="left" label="实裁数量" 		prop="数量"  		width="100"/>
+						  	</el-table>
+						  </el-tab-pane>
+						  
+						  
+						<el-tab-pane label="产量进度汇总记录"   @click="showTable('产量进度汇总记录')" name="two">
 							<el-table ref="multipleTable" style="width: 100%;height: 52vh" tooltip-effect="dark"
 							          :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
 							          :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
@@ -109,15 +136,9 @@
 							          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="120"/> -->
 									  <el-table-column   align="left" label="订单子编号" prop="子订单编号"  width="130"/>
-									  <!-- <el-table-column  sortable  align="left" label="客户编号" prop="客户编号" width="120"/> -->
 									  <el-table-column    align="left" label="款号" prop="款号" width="140" />
-									  <!-- <el-table-column  sortable  align="left" label="款式" prop="款式" width="100" /> -->
 									  <el-table-column    align="left" label="色系名称" prop="颜色" width="100" />
-									  <!-- <el-table-column  sortable  align="left" label="组别" prop="组别" width="100" /> -->
-									  
 									  <el-table-column v-for="item in sizeDatas" :key="item" align="left" :label="item"
 										:prop="item" width="60" :cell-style="cellStyle">
 										<template v-slot="scope">
@@ -128,8 +149,6 @@
 											</div>
 										</template>
 										</el-table-column>
-										
-									  <!-- <el-table-column  sortable  align="left" label="制单总数" prop="制单数" width="108" /> -->
 									  <el-table-column    align="left" label="裁剪数" prop="裁剪数" width="90" />
 									  <el-table-column    align="left" label="上报时间" prop="上报时间" width="160" />
 							</el-table>
@@ -260,7 +279,7 @@ import $ from 'jquery';
 import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue';
-import {getSpotList,getInfo,OrderAttachments,getTabByGdbh,search} from '@/api/mes/job';
+import {getSpotList,getInfo,OrderAttachments,getTabByGdbh,search,spotcheckdel} from '@/api/mes/job';
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import {ElMessage} from "element-plus";
@@ -425,6 +444,7 @@ function updateTotal() {
 //进度汇总表格数据
 const add_tableData = reactive([]);
 const jdhz_tableData = reactive([]);
+const bgjdhz_tableData = reactive([]);
 const _order = ref('');
 const _UniqId = ref('');
 //尺寸列表
@@ -473,7 +493,7 @@ const add_onSubmit = async ()=>{
 	
 	 sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers);
 	 jdhz_tableData.splice(0, jdhz_tableData.length, ...getSpotLists.data.table);
-	
+	 bgjdhz_tableData.splice(0, bgjdhz_tableData.length, ...getSpotLists.data.bgtable);
 	//xlsx附件
 	const searchValue = add_searchInfo.value.split('-')[0];
 	const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
@@ -850,6 +870,23 @@ const gd_yulan = () => {
       printPageRef.value.open(order) 
   }
 }
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+	console.log(Selection.value)
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
 
 // =========== 分页 ===========
 // 分页相关的响应式变量
@@ -1075,6 +1112,25 @@ const handleSizeChange = (val) => {
 	font-size: 20px; 
   color: red !important;
 }
+/* 表格复选框大小调整 */
+	:deep(.el-checkbox.el-checkbox--small .el-checkbox__inner) {
+		width: 30px;
+		/* 复选框宽度 */
+		height: 20px;
+		/* 复选框高度 */
+	}
 
+	:deep(.el-checkbox.el-checkbox--small.is-checked .el-checkbox__inner::after) {
+		transform: scale(1.2) rotate(45deg);
+		/* 调整选中后的对勾大小 */
+		top: 5%;
+		/* 调整对勾位置 */
+		left: 40%;
+		/* 调整对勾位置 */
+		width: 5px;
+		/* 调整对勾宽度 */
+		height: 9px;
+		/* 调整对勾高度 */
+	}
 
 </style>

+ 103 - 68
src/view/performance/chafengbaogong.vue

@@ -68,72 +68,86 @@
 						    </el-button>
 						  </el-col>
 					  </el-row>
-						
-
-					<el-row :gutter="0">
-						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 50px;">尺 码</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm1" id="cm1" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm2" id="cm2" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm3" id="cm3" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style=	"padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
-					</el-row>
-					
-					<el-row :gutter="0">
-						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 30px;">制单数</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl1" id="zdsc1" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl2" id="zdsc2" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl3" id="zdsc3" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl4" id="zdsc4" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl5" id="zdsc5" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl6" id="zdsc6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl7" id="zdsc7" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl8" id="zdsc8" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl9" id="zdsc9" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl10" id="zdsc10" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="zdslformdata.zdtotal" id="zdtotal" readonly style="width: 65px;height: 40px;" /></el-col>
-					</el-row>
-					
-					<el-row :gutter="0">
-						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 30px;">实裁数</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl1" id="scsl1" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl2" id="scsl2" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl3" id="scsl3" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl4" id="scsl4" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl5" id="scsl5" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl6" id="scsl6" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl7" id="scsl7" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl8" id="scsl8" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl9" id="scsl9" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl10" id="scsl10" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1"><el-input v-model="scslformdata.sctotal" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
-					</el-row>
-					
-					<el-row :gutter="0">
-						<el-col :span="2.5"><el-text style="font-size: 30px;">上报数量</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl1" id="sl1"  :readonly="!scslformdata.scsl1" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl2" id="sl2"  :readonly="!scslformdata.scsl2" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl3" id="sl3"  :readonly="!scslformdata.scsl3" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl4" id="sl4"  :readonly="!scslformdata.scsl4" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl5" id="sl5"  :readonly="!scslformdata.scsl5" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl6" id="sl6"  :readonly="!scslformdata.scsl6" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl7" id="sl7"  :readonly="!scslformdata.scsl7" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl8" id="sl8"  :readonly="!scslformdata.scsl8" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl9" id="sl9"  :readonly="!scslformdata.scsl9" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl10" id="sl10"  :readonly="!scslformdata.scsl10" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="2"><el-input v-model="slformdata.sctotal" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
-						<el-button type="primary" @click="add_Dialog"
-							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 0px">报工</el-button>
-						<el-button type="primary" @click="cp_gdprintonClick"
-							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 15px">订单表预览</el-button>
-					</el-row>
-				
+					  
+					  
+					  
+					  <el-row :gutter="0">
+					    <el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 52px;">尺&nbsp;码</el-text></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm1" id="cm1" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm2" id="cm2" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm3" id="cm3" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 65px;height: 40px;" /></el-col>
+					    <el-col :span="1"><el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 80px;height: 40px;" /></el-col>
+					    <!-- 删除报工按钮 -->
+					    <el-col :span="2">
+					      <el-button  type="danger" icon="delete" @click="del_delclick"
+					        v-if="delall === true" :disabled="Selection === ''"
+					        :style="{
+					          backgroundColor: Selection === '' ? '' : 'red',
+					          borderColor: Selection === '' ? '' : 'red',
+					          color: Selection === '' ? '' : '#fff'
+					        }"
+					        style="width: 150px; height: 40px; font-size: 20px; margin-left: 30px;">删除报工</el-button>
+					    </el-col>
+					  </el-row>
+					  
+					  <el-row :gutter="0">
+					   <el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 30px;">制单数</el-text></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl1" id="zdsc1" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl2" id="zdsc2" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl3" id="zdsc3" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl4" id="zdsc4" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl5" id="zdsc5" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl6" id="zdsc6" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl7" id="zdsc7" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl8" id="zdsc8" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl9" id="zdsc9" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="zdslformdata.cmsl10" id="zdsc10" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1"><el-input v-model="zdslformdata.zdtotal" id="zdtotal" readonly style="width: 80px;height: 40px;" /></el-col>
+					   <el-col :span="2">
+					     <el-button type="primary" @click="cp_gdprintonClick" style="width: 150px; height: 40px; font-size: 20px; margin-left: 30px;" >  订单表预览 </el-button>
+					   </el-col>
+					  </el-row>
+					  
+					  <el-row :gutter="0">
+					   <el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 30px;">实裁数</el-text></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl1" id="scsl1" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl2" id="scsl2" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl3" id="scsl3" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl4" id="scsl4" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl5" id="scsl5" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl6" id="scsl6" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl7" id="scsl7" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl8" id="scsl8" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl9" id="scsl9" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scslformdata.scsl10" id="scsl10" readonly style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1"><el-input v-model="scslformdata.sctotal" id="cm11" readonly style="width: 80px;height: 40px;" /></el-col>
+					  </el-row>
+					  
+					  <el-row :gutter="0">
+					   <el-col :span="2.5"><el-text style="font-size: 30px;">上报数量</el-text></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl1" id="sl1"  :readonly="!scslformdata.scsl1" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl2" id="sl2"  :readonly="!scslformdata.scsl2" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl3" id="sl3"  :readonly="!scslformdata.scsl3" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl4" id="sl4"  :readonly="!scslformdata.scsl4" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl5" id="sl5"  :readonly="!scslformdata.scsl5" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl6" id="sl6"  :readonly="!scslformdata.scsl6" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl7" id="sl7"  :readonly="!scslformdata.scsl7" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl8" id="sl8"  :readonly="!scslformdata.scsl8" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl9" id="sl9"  :readonly="!scslformdata.scsl9" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl10" id="sl10"  :readonly="!scslformdata.scsl10" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+					   <el-col :span="1"><el-input v-model="slformdata.sctotal" id="cm11" readonly style="width: 80px;height: 40px;" /></el-col>
+					    <el-col :span="2">
+					      <el-button type="primary" @click="add_Dialog" style="width: 150px; height: 40px; font-size: 20px; margin-left: 30px;" >报工</el-button>
+					    </el-col>
+					  </el-row>
+
 					
 							<!-- 表格数据 -->
 							  <el-tabs v-model="activeName">
@@ -154,8 +168,9 @@
 							    @row-dblclick="updateCompanyFunc"
 							    @row-click="tableRowClick"
 							    :show-overflow-tooltip="true"
-							    @selection-change="handleSelectionChange"
+							    @selection-change="selectionChange"
 							>
+							<el-table-column type="selection" width="60" />
 							    <!-- 操作列 -->
 							    <el-table-column align="left" label="操作" width="150">
 							        <template v-slot="scope">
@@ -335,7 +350,7 @@ import LuckyExcel from 'luckyexcel';
 import {Layout,LayoutSider,LayoutContent} from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref,reactive,nextTick,watch,setBlockTracking} from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,processAdd} from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,processAdd,spotcheckdel} from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import {ElMessage} from "element-plus";
@@ -1187,6 +1202,26 @@ const add_printxp = async () => {
 	}
 };
 
+
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+	console.log(Selection.value)
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
+
+
 // =========== 分页 ===========
 // 分页相关的响应式变量
 const page = ref(1)

+ 106 - 99
src/view/performance/datangbaogong.vue

@@ -7,9 +7,9 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">{{_code}}报工</h1>
 				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
 					<!-- 子订单编号输入框 -->
-					<el-col :span="4"  style="padding: 0px;margin: 0px;">
-					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
-					</el-col>
+					<!-- <el-col :span="5"  style="padding: 0px;margin: 0px;"> -->
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 295px; height: 50px;"/>
+					<!-- </el-col> -->
 				
 					<!-- 查询按钮 -->
 					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
@@ -46,26 +46,28 @@
 						<el-text style="font-size: 30px;">尺码</el-text>
 					</el-col>
 					<!-- 尺码输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<!-- &nbsp;&nbsp;&nbsp;
+					<p style="font-size: 24px;color: red;">{{add_formData['尺码']}}</p>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">总数量</el-text>
 					</el-col>
 					<!-- 总数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">剩余数量</el-text>
 					</el-col>
 					<!--剩余数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 						
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 100%; height: 40px;"/></el-col>
-						
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 80%; height: 40px;"/></el-col>
 				
 					<!-- 是否尾包文本 -->
 					<el-col :span="2.5">
@@ -106,65 +108,75 @@
 										: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="add_xpSelectionChange">
-									<!-- <el-table-column type="selection" width="70" /> -->
-									<el-table-column sortable align="left" label="流水号" prop="serial" width="100"/>
-									<el-table-column sortable align="left" label="报工时间" prop="sys_rq" width="160"/>
-									<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="130"/>
-									<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="130"/>
-									<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="110"/>
-									<el-table-column sortable align="left" label="是否尾包" prop="尾包" width="130"/>
-									<!-- <el-table-column sortable align="left" label="组别" prop="组别" width="130"/> -->
+										: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 align="left" label="尺码" 		prop="尺码"  		width="70"/>
+									<el-table-column align="left" label="数量" 		prop="数量"  		width="70"/>
+									<el-table-column align="left" label="上报数量" 	prop="次品数量"  	width="85"/>
+									<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>
-							  </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="handleSelectionChange">
-							  	 <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>
-							      </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>
+							 </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="handleSelectionChange">
+							 	 <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>
+							     </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="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-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">订单表预览</el-button>
+						<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: 100px;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>
 		  <!-- </el-main> -->
@@ -235,7 +247,7 @@ import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh } from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel } from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -263,12 +275,12 @@ const printPageRef = ref()
 
 //全局获取code,接口接收code
 const _code = '大烫'
+//全局获取工序
+const _gx = '5'
 //全局接口接受的物理地址
 const Machine = ref('')
 //全局获取UniqId
 const UniqId = ref('')
-//全局获取工序
-const _gx = '5'
 //全局获取工序名称
 const _gxmc = _code
 const add_formData = reactive({
@@ -379,6 +391,11 @@ const add_onSubmit = async ()=>{
 	 _order.value = add_searchInfo.value;
 	 //获取下面报工历史记录
 	 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:add_formData['机台号']});
+	 console.log("getSpotLists.data.result.ci_num::",getSpotLists.data.result.ci_num)
+	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
+	 		 ElMessage({type: 'error',message: '已上报,无需再次报工' })
+	 		 add_searchInfo.value = ''
+	 }
 	 console.log(getSpotLists)
 	 if(getSpotLists.data === null){
 		 add_searchInfo.value = ''
@@ -400,17 +417,17 @@ const add_onSubmit = async ()=>{
 	 add_formData['剩余数量'] = getSpotLists.data.result.ci_num
 	 add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
 	 
-	//xlsx附件
-	const searchValue = add_searchInfo.value.split('-')[0];
-	const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
-	const ddOrderAttachments = await OrderAttachments({order:searchValue,desc:'订单资料附件'})
-	jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
-	ddtableData.splice(0,ddOrderAttachments.data.length,...ddOrderAttachments.data);
+	 //xlsx附件
+	 const searchValue = add_searchInfo.value.split('-')[0];
+	 const jsOrderAttachments = await OrderAttachments({order:searchValue,desc:'技术附件'})
+	 const ddOrderAttachments = await OrderAttachments({order:searchValue,desc:'订单资料附件'})
+	 jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
+	 ddtableData.splice(0,ddOrderAttachments.data.length,...ddOrderAttachments.data);
 	 
 }
 //订单资料excel展示
 const gdbomupdateCompanyFunc = (row) =>{
-	// 加载插件和样式
+// 加载插件和样式
 	const loadScriptsAndStyles = () => {
 	    $.getScript('/luckysheet/plugins/js/plugin.js', () => {
 	        $script('/luckysheet/luckysheet.umd.js', () => {
@@ -625,48 +642,20 @@ console.log(UniqId.value)
 		params.s_num = add_formData['上报数量']
 		params.ci_num = add_formData['剩余数量']
 		console.log(params)
-		
-		// 记录每一次上报数据信息日志
-			// let datalog = {};
-			// datalog.code = _code;
-			// datalog.订单编号 = _list.value.订单编号;
-			// datalog.子订单编号 = _list.value.order;
-			// datalog.款号 = _list.value.生产款号;
-			// datalog.款式 = _list.value.款式;
-			// datalog.颜色 = _list.value.颜色;
-			// datalog.上报时间 = currentDate;
-			// datalog.上报数量 = add_formData['上报数量'];
-			// // 记录总实裁数
-			// datalog.sctotal = _list.value.sctotal;
-			// datalog.zdtotal = _list.value.zdtotal;
-			// datalog['组别'] = add_formData['组别'];
-			
-			// console.log(_list)
-			// console.log(datalog)
-			// const getTabByGdbhs = await getTabByGdbh(datalog);
-		// return false;
 		const cf_gettab = await search(params); // 调用search函数  
 		if (cf_gettab.code === 0) {
-			// const firstPart = add_searchInfo.value.split(',')[0];  
-			//上报后历史记录表格刷新
-			const lsjltable = await getTab({order_id:_order.value.split(',')[0],sczl_jtbh:add_formData['机台号']}); 
-			add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
-			// //上报后刷新表格数据
-			// const getSpotLists = await getSpotList({order:_order.value.split(',')[0],code:_code,sys_sbID:sys_sbID});
-			// add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
+			add_onSubmit();
 			add_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
 				if (inputElement) {
 					inputElement.focus();		
 				}
-			}, 100); // 延迟100毫秒
-			// searcs.value = '';
+			}, 100); 
 			add_formData['尺码']=''
 			add_formData['总数量']=''
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
-		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
@@ -748,6 +737,24 @@ const table_selectrows = ref([]);
 const table_SelectionChange = (val) => {
   table_selectrows.value = val; // 将选中的行数据保存到 table_selectrows
 }
+
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+	console.log(Selection.value)
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
   
  
 // =========== 分页 ===========

+ 63 - 49
src/view/performance/houdaoshougong.vue

@@ -7,9 +7,9 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">{{_code}}报工</h1>
 				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
 					<!-- 子订单编号输入框 -->
-					<el-col :span="4"  style="padding: 0px;margin: 0px;">
-					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
-					</el-col>
+					<!-- <el-col :span="5"  style="padding: 0px;margin: 0px;"> -->
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 295px; height: 50px;"/>
+					<!-- </el-col> -->
 				
 					<!-- 查询按钮 -->
 					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
@@ -46,26 +46,28 @@
 						<el-text style="font-size: 30px;">尺码</el-text>
 					</el-col>
 					<!-- 尺码输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<!-- &nbsp;&nbsp;&nbsp;
+					<p style="font-size: 24px;color: red;">{{add_formData['尺码']}}</p>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">总数量</el-text>
 					</el-col>
 					<!-- 总数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">剩余数量</el-text>
 					</el-col>
 					<!--剩余数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 						
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 100%; height: 40px;"/></el-col>
-						
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 80%; height: 40px;"/></el-col>
 				
 					<!-- 是否尾包文本 -->
 					<el-col :span="2.5">
@@ -106,12 +108,20 @@
 										: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="add_xpSelectionChange">
-									<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"/>
+										: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 align="left" label="尺码" 		prop="尺码"  		width="70"/>
+									<el-table-column align="left" label="数量" 		prop="数量"  		width="70"/>
+									<el-table-column align="left" label="上报数量" 	prop="次品数量"  	width="85"/>
+									<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>
 								
@@ -156,8 +166,17 @@
 					</el-main>
 				</layout-content>
 					<div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<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-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">订单表预览</el-button>
+						<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: 100px;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>
 		  <!-- </el-main> -->
@@ -228,7 +247,7 @@ import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh } from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel } from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -256,12 +275,12 @@ const printPageRef = ref()
 
 //全局获取code,接口接收code
 const _code = '手工'
+//全局获取工序
+const _gx = '4'
 //全局接口接受的物理地址
 const Machine = ref('')
 //全局获取UniqId
 const UniqId = ref('')
-//全局获取工序
-const _gx = '4'
 //全局获取工序名称
 const _gxmc = _code
 const add_formData = reactive({
@@ -372,6 +391,11 @@ const add_onSubmit = async ()=>{
 	 _order.value = add_searchInfo.value;
 	 //获取下面报工历史记录
 	 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:add_formData['机台号']});
+	 console.log("getSpotLists.data.result.ci_num::",getSpotLists.data.result.ci_num)
+	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
+		 ElMessage({type: 'error',message: '已上报,无需再次报工' })
+		 add_searchInfo.value = ''
+	 }
 	 console.log(getSpotLists)
 	 if(getSpotLists.data === null){
 		 add_searchInfo.value = ''
@@ -618,48 +642,20 @@ console.log(UniqId.value)
 		params.s_num = add_formData['上报数量']
 		params.ci_num = add_formData['剩余数量']
 		console.log(params)
-		
-		// // 记录每一次上报数据信息日志
-		// 	let datalog = {};
-		// 	datalog.code = _code;
-		// 	datalog.订单编号 = _list.value.订单编号;
-		// 	datalog.子订单编号 = _list.value.order;
-		// 	datalog.款号 = _list.value.生产款号;
-		// 	datalog.款式 = _list.value.款式;
-		// 	datalog.颜色 = _list.value.颜色;
-		// 	datalog.上报时间 = currentDate;
-		// 	datalog.上报数量 = add_formData['上报数量'];
-		// 	// 记录总实裁数
-		// 	datalog.sctotal = _list.value.sctotal;
-		// 	datalog.zdtotal = _list.value.zdtotal;
-		// 	datalog['组别'] = add_formData['组别'];
-			
-		// 	console.log(_list)
-		// 	console.log(datalog)
-		// 	const getTabByGdbhs = await getTabByGdbh(datalog);
-		// return false;
 		const cf_gettab = await search(params); // 调用search函数  
 		if (cf_gettab.code === 0) {
-			// const firstPart = add_searchInfo.value.split(',')[0];  
-			//上报后历史记录表格刷新
-			const lsjltable = await getTab({order_id:_order.value.split(',')[0],sczl_jtbh:add_formData['机台号']}); 
-			add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
-			// //上报后刷新表格数据
-			// const getSpotLists = await getSpotList({order:_order.value.split(',')[0],code:_code,sys_sbID:sys_sbID});
-			// add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
+			add_onSubmit();
 			add_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
 				if (inputElement) {
 					inputElement.focus();		
 				}
-			}, 100); // 延迟100毫秒
-			// searcs.value = '';
+			}, 100); 
 			add_formData['尺码']=''
 			add_formData['总数量']=''
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
-		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
@@ -741,6 +737,24 @@ const table_selectrows = ref([]);
 const table_SelectionChange = (val) => {
   table_selectrows.value = val; // 将选中的行数据保存到 table_selectrows
 }
+
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+	console.log(Selection.value)
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
   
  
 // =========== 分页 ===========

+ 101 - 95
src/view/performance/zongjianbaogong.vue

@@ -7,9 +7,9 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">{{_code}}报工</h1>
 				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
 					<!-- 子订单编号输入框 -->
-					<el-col :span="4"  style="padding: 0px;margin: 0px;">
-					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
-					</el-col>
+					<!-- <el-col :span="5"  style="padding: 0px;margin: 0px;"> -->
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 295px; height: 50px;"/>
+					<!-- </el-col> -->
 				
 					<!-- 查询按钮 -->
 					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
@@ -46,26 +46,28 @@
 						<el-text style="font-size: 30px;">尺码</el-text>
 					</el-col>
 					<!-- 尺码输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<!-- &nbsp;&nbsp;&nbsp;
+					<p style="font-size: 24px;color: red;">{{add_formData['尺码']}}</p>
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">总数量</el-text>
 					</el-col>
 					<!-- 总数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 					
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">剩余数量</el-text>
 					</el-col>
 					<!--剩余数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 80%; height: 40px;"/></el-col>
 						
 					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
 						<el-text style="font-size: 30px;">上报数量</el-text>
 					</el-col>
 					<!--上报数量输入框 -->
-					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 100%; height: 40px;"/></el-col>
-						
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']"  @input="baogongslpd" id="s_num" style="width: 80%; height: 40px;"/></el-col>
 				
 					<!-- 是否尾包文本 -->
 					<el-col :span="2.5">
@@ -106,65 +108,75 @@
 										: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="add_xpSelectionChange">
-									<!-- <el-table-column type="selection" width="70" /> -->
-									<el-table-column sortable align="left" label="流水号" prop="serial" width="100"/>
-									<el-table-column sortable align="left" label="报工时间" prop="sys_rq" width="160"/>
-									<el-table-column sortable align="left" label="订单编号" prop="订单编号" width="130"/>
-									<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="130"/>
-									<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="110"/>
-									<el-table-column sortable align="left" label="是否尾包" prop="尾包" width="130"/>
-									<!-- <el-table-column sortable align="left" label="组别" prop="组别" width="130"/> -->
+										: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 align="left" label="尺码" 		prop="尺码"  		width="70"/>
+									<el-table-column align="left" label="数量" 		prop="数量"  		width="70"/>
+									<el-table-column align="left" label="上报数量" 	prop="次品数量"  	width="85"/>
+									<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>
-							</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="handleSelectionChange">
-								 <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>
-							    </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>
+							 </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="handleSelectionChange">
+							 	 <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>
+							     </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="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-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">订单表预览</el-button>
+						<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: 100px;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>
 		  <!-- </el-main> -->
@@ -235,7 +247,7 @@ import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh } from '@/api/mes/job'
+import {getSpotList,search,getTab,OrderAttachments,getTabByGdbh,spotcheckdel } from '@/api/mes/job'
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
@@ -263,12 +275,12 @@ const printPageRef = ref()
 
 //全局获取code,接口接收code
 const _code = '总检'
+//全局获取工序
+const _gx = '6'
 //全局接口接受的物理地址
 const Machine = ref('')
 //全局获取UniqId
 const UniqId = ref('')
-//全局获取工序
-const _gx = '6'
 //全局获取工序名称
 const _gxmc = _code
 const add_formData = reactive({
@@ -379,7 +391,11 @@ const add_onSubmit = async ()=>{
 	 _order.value = add_searchInfo.value;
 	 //获取下面报工历史记录
 	 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:add_formData['机台号']});
-	 console.log(getSpotLists)
+	 console.log("getSpotLists.data.result.ci_num::",getSpotLists.data.result.ci_num)
+	 if(getSpotLists.data.result.ci_num === 0 || getSpotLists.data.result.ci_num === '0'){
+	 		 ElMessage({type: 'error',message: '已上报,无需再次报工' })
+	 		 add_searchInfo.value = ''
+	 }
 	 if(getSpotLists.data === null){
 		 add_searchInfo.value = ''
 		 add_formData['尺码'] = ''
@@ -410,7 +426,7 @@ const add_onSubmit = async ()=>{
 }
 //订单资料excel展示
 const gdbomupdateCompanyFunc = (row) =>{
-	// 加载插件和样式
+// 加载插件和样式
 	const loadScriptsAndStyles = () => {
 	    $.getScript('/luckysheet/plugins/js/plugin.js', () => {
 	        $script('/luckysheet/luckysheet.umd.js', () => {
@@ -486,7 +502,7 @@ const gdbomupdateCompanyFunc = (row) =>{
 }
 //技术资料excel展示
 const ExcelShow = (row) =>{
-// 加载插件和样式
+	// 加载插件和样式
 	const loadScriptsAndStyles = () => {
 	    $.getScript('/luckysheet/plugins/js/plugin.js', () => {
 	        $script('/luckysheet/luckysheet.umd.js', () => {
@@ -625,48 +641,20 @@ console.log(UniqId.value)
 		params.s_num = add_formData['上报数量']
 		params.ci_num = add_formData['剩余数量']
 		console.log(params)
-		
-		// 记录每一次上报数据信息日志
-			// let datalog = {};
-			// datalog.code = _code;
-			// datalog.订单编号 = _list.value.订单编号;
-			// datalog.子订单编号 = _list.value.order;
-			// datalog.款号 = _list.value.生产款号;
-			// datalog.款式 = _list.value.款式;
-			// datalog.颜色 = _list.value.颜色;
-			// datalog.上报时间 = currentDate;
-			// datalog.上报数量 = add_formData['上报数量'];
-			// // 记录总实裁数
-			// datalog.sctotal = _list.value.sctotal;
-			// datalog.zdtotal = _list.value.zdtotal;
-			// datalog['组别'] = add_formData['组别'];
-			
-			// console.log(_list)
-			// console.log(datalog)
-			// const getTabByGdbhs = await getTabByGdbh(datalog);
-		// return false;
 		const cf_gettab = await search(params); // 调用search函数  
 		if (cf_gettab.code === 0) {
-			// const firstPart = add_searchInfo.value.split(',')[0];  
-			//上报后历史记录表格刷新
-			const lsjltable = await getTab({order_id:_order.value.split(',')[0],sczl_jtbh:add_formData['机台号']}); 
-			add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
-			// //上报后刷新表格数据
-			// const getSpotLists = await getSpotList({order:_order.value.split(',')[0],code:_code,sys_sbID:sys_sbID});
-			// add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
+			add_onSubmit();
 			add_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
 				if (inputElement) {
 					inputElement.focus();		
 				}
-			}, 100); // 延迟100毫秒
-			// searcs.value = '';
+			}, 100); 
 			add_formData['尺码']=''
 			add_formData['总数量']=''
 			add_formData['上报数量']=''
 			add_formData['剩余数量']=''
-		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
@@ -748,6 +736,24 @@ const table_selectrows = ref([]);
 const table_SelectionChange = (val) => {
   table_selectrows.value = val; // 将选中的行数据保存到 table_selectrows
 }
+
+//报工删除
+const delall = ref(true)
+const Selection = ref('')
+const selectionChange = (selection, type) => {
+  console.log(selection)
+	const ids = selection.map(item => {
+		return item.UniqId
+	})
+	Selection.value = ids.join(',')
+}
+const del_delclick = async () => {
+	console.log(Selection.value)
+	console.log(add_formData['组别'])
+	const res1 = await spotcheckdel({UniqId:Selection.value,sys_id:add_formData['组别']})
+	res1.code === 0 && ElMessage.success('删除成功')
+	add_onSubmit()
+}
   
  
 // =========== 分页 ===========