优化

src/view/performance/baozhuangbaogong.vue

@@ -509,23 +509,23 @@ console.log(UniqId.value)
 		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['组别'];
+			// 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);
+			// 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) {

src/view/performance/caiqiebaogong.vue

@@ -41,7 +41,11 @@
 		      	<!-- 人员输入框 -->
 		      	<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
 		      </el-row>
+			  
+			 
 
+				
+				
 					<el-row :gutter="0">
 						<el-col :span="2.5"><el-text style="font-size: 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>
@@ -93,6 +97,9 @@
 							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 15px">工单预览</el-button>
 					</el-row>
 					
+					
+					
+					
 		      <el-main>
 					<!-- 表格数据 -->
 					  <el-tabs v-model="activeName">
@@ -435,7 +442,6 @@ const add_onSubmit = async ()=>{
 	   ElMessage({type: 'warning',message: '此订单未出库，请先出库' })
 	   return false
 	 }
-	 console.log('查询数据',getSpotLists.data)
 	 setTimeout(() => {
 	 	  const inputElement = document.getElementById('scs1');
 	 	  if (inputElement) {
@@ -444,9 +450,7 @@ const add_onSubmit = async ()=>{
 	 }, 100);//100毫秒
 	 
 	 sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers);
-	//  add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.list);
 	 jdhz_tableData.splice(0, jdhz_tableData.length, ...getSpotLists.data.table);
-	 console.log('上方数据',jdhz_tableData)
 	
 	//技术附件
 	const searchValue = add_searchInfo.value.split('-')[0];
@@ -673,29 +677,29 @@ const add_Dialog = async ()=>{
 	
 	
 	
-	// 记录每一次上报数据信息日志
-	let datalog = {};
-	datalog.code = _code;
-	datalog.订单编号 = _list.value[0].订单编号;
-	datalog.子订单编号 = _list.value[0].子订单编号;
-	datalog.款号 = _list.value[0].款号;
-	datalog.款式 = _list.value[0].款式;
-	datalog.颜色 = _list.value[0].颜色;
-	datalog.上报时间 = currentDate;
-	//循环生成 cm1 到 cm20 的字段
-	for (let i = 1; i <= 10; i++) {
-	    datalog[`cm${i}`] = _list.value[0][`cm${i}`];
-	}
-	//循环生成 scsl1 到 scsl20 的字段
-	for (let i = 1; i <= 10; i++) {
-	    datalog[`scsl${i}`] = scsformdata[`scs${i}`];
-	}
-	// 记录总实裁数
-	datalog.sctotal = scsformdata.sctotal;
-	datalog.zdtotal = cmslformdata['zdtotal'];
-	datalog['组别'] = add_formData['组别'];
-	console.log(datalog)
-	const getTabByGdbhs = await getTabByGdbh(datalog);
+	// // 记录每一次上报数据信息日志
+	// let datalog = {};
+	// datalog.code = _code;
+	// datalog.订单编号 = _list.value[0].订单编号;
+	// datalog.子订单编号 = _list.value[0].子订单编号;
+	// datalog.款号 = _list.value[0].款号;
+	// datalog.款式 = _list.value[0].款式;
+	// datalog.颜色 = _list.value[0].颜色;
+	// datalog.上报时间 = currentDate;
+	// //循环生成 cm1 到 cm20 的字段
+	// for (let i = 1; i <= 10; i++) {
+	//     datalog[`cm${i}`] = _list.value[0][`cm${i}`];
+	// }
+	// //循环生成 scsl1 到 scsl20 的字段
+	// for (let i = 1; i <= 10; i++) {
+	//     datalog[`scsl${i}`] = scsformdata[`scs${i}`];
+	// }
+	// // 记录总实裁数
+	// datalog.sctotal = scsformdata.sctotal;
+	// datalog.zdtotal = cmslformdata['zdtotal'];
+	// datalog['组别'] = add_formData['组别'];
+	// console.log(datalog)
+	// const getTabByGdbhs = await getTabByGdbh(datalog);
 	
 	// //光标跳转input框
 	// setTimeout(() => {
@@ -742,8 +746,8 @@ const add_Dialog = async ()=>{
 	           } else {
 	               console.error('scsformdata 未定义');
 	           }
-			   const getSpotLists = await getSpotList({ order: _order.value, code: _code });
-			   jdhz_tableData.splice(0, jdhz_tableData.length, ...getSpotLists.data.rows); //表格数据
+			   const getSpotLists = await getSpotList({ order: _order.value, code: _code});
+			   jdhz_tableData.splice(0, jdhz_tableData.length, ...getSpotLists.data.tale);
 	           add_searchInfo.value = ''; // 清空搜索信息
 	       } else {
 	           ElMessage({ type: 'error', message: '报工失败' });

src/view/performance/datangbaogong.vue

@@ -509,23 +509,23 @@ console.log(UniqId.value)
 		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['组别'];
+			// 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);
+			// 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) {

src/view/performance/houdaoshougong.vue

@@ -508,24 +508,24 @@ console.log(UniqId.value)
 		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['组别'];
+		// // 记录每一次上报数据信息日志
+		// 	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);
+		// 	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) {

src/view/performance/zongjianbaogong.vue

@@ -509,23 +509,23 @@ console.log(UniqId.value)
 		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['组别'];
+			// 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);
+			// 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) {

src/view/yunyin/shengchanguanli/baogongshuju.vue

@@ -55,10 +55,9 @@
         </layout-header>
 
 				<!-- 删除弹窗 -->
-        <el-dialog v-model="deletedialog" :before-close="luckyexcelCloseDialog" style='height: 75%;margin-left: 15%;' width="70%"  >
+        <el-dialog v-model="deletedialog" :before-close="luckyexcelCloseDialog" style='height: 80%;margin-left: 8%;margin-top: 5%;' width="80%"  >
 					<div class="block">
             <h3 style="color:red;font-size: 24px;margin:-5px 0px 8px 12px;">报工删除历史记录</h3>
-						<!-- <el-button type="primary" @click="ExcelonSubmit" style='margin-left: 10px;'>查询</el-button> -->
 					  </div>
 					  <br>
 					<el-table ref="multipleTable" style="width: 100%;height: 60vh" tooltip-effect="dark"
@@ -68,15 +67,18 @@
 					          size="small" highlight-current-row="true" :show-overflow-tooltip="true"
 					          @row-click="add_tableRowClick" @row-dblclick="add_updateCompanyFunc"
 					          @selection-change="Excel_Selection">
-                    <el-table-column  align="center" label="订单编号" prop="订单编号" width="200"/>
-                    <el-table-column  align="center" label="客户编号" prop="客户编号" width="100"/>
-                    <el-table-column  align="center" label="删除用户" prop="delsys_id" width="160"/>
-                    <el-table-column  align="center" label="款式" prop="款式" width="130"/>
-                    <el-table-column  align="center" label="生产款号" prop="款号" width="200"/>
-                    <el-table-column  align="center" label="制单数" prop="制单数" width="120"/>
-                    <el-table-column  align="center" label="删除时间" prop="mod_rq" width="300"/>
+                    <el-table-column  align="left" label="订单编号" prop="订单编号" width="100"/>
+					<el-table-column  align="left" label="子订单编号" prop="子订单编号" width="140"/>
+                    <el-table-column  align="left" label="客户编号" prop="客户编号" width="80"/>
+                    <el-table-column  align="left" label="款式" prop="款式" width="80"/>
+					<el-table-column  align="left" label="尺码" prop="尺码" width="60"/>
+					<el-table-column  align="left" label="数量" prop="数量" width="60"/>
+					<el-table-column  align="left" label="班组" prop="sczl_bh" width="80"/>
+                    <el-table-column  align="left" label="生产款号" prop="款号" width="200"/>
+                    <el-table-column  align="left" label="制单数" prop="制单数" width="80"/>
+					<el-table-column  align="left" label="删除用户" prop="delsys_id" width="150"/>
+                    <el-table-column  align="left" label="删除时间" prop="mod_rq" width="155"/>
 					</el-table>
-          <h3 style="font-size: 15px;margin:15px 0px 8px 1250px;">共{{del_total}}条</h3>
 				</el-dialog>  
         <layout>
           <!--左侧树侧形结构-->
@@ -102,17 +104,18 @@
                         @row-click="tableRowClick" :show-overflow-tooltip="true"
                         @selection-change="selectionChange">
 				<el-table-column align="center" type="selection" width="30"/>
-				<el-table-column  align="left" label="订单编号" prop="订单编号" width="98"/>
+				<el-table-column  align="left" label="订单编号" prop="订单编号" width="97"/>
+				<el-table-column  align="left" label="子订单编号" prop="子订单编号" width="130"/>
 				<el-table-column  align="left" label="客户编号" prop="客户编号" width="80"/>
-				<el-table-column  align="left" label="款式" prop="款式" width="100"/>
+				<el-table-column  align="left" label="款式" prop="款式" width="90"/>
 				<el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
 				<!-- 尺码列表 -->
 				<template v-for="item in sizeDatas">
-				  <el-table-column align="left"  :label=item :prop=item  width="80"/> 
+				  <el-table-column align="center"  :label=item :prop=item  width="50"/> 
 				</template>
-				<el-table-column  align="left" label="制单数" prop="制单数" width="80"/>
+				<!-- <el-table-column  align="left" label="制单数" prop="制单数" width="80"/> -->
 				<el-table-column  align="left" label="上报时间" prop="上报时间" width="150"/>
-				<el-table-column  align="left" label="船样" prop="船样" width="70"/>
+				<el-table-column  align="left" label="船样" prop="船样" width="50"/>
 
               </el-table>
               <div class="gva-pagination">

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -868,7 +868,6 @@
     </layout>
 
     <PrintPage ref="printPageRef" />
-
 		<!-- <div class="print-section">
 		 <link href="https://cdn.jsdelivr.net/npm/vue-plugin-hiprint@1.0.0/dist/print-lock.css" rel="stylesheet" media="print">
 		 <link href="https://unpkg.com/vue-plugin-hiprint@1.0.0/dist/print-lock.css" rel="stylesheet">
@@ -911,6 +910,7 @@ getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments,getPo
 import PrintPage from './components/print.vue'
 import AddGongYi from './components/addGongYi.vue'  
 import { useUserStore } from '@/pinia/modules/user';
+
 defineOptions({name: 'Company'})
 //定义打印跳转页面
 const printPageRef = ref()