优化

src/view/performance/baozhuangbaogong.vue

@@ -2,7 +2,7 @@
 	<div>
 	  <layout>
 		  <layout-content >
-		  <el-main>
+		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">包装报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
@@ -87,7 +87,7 @@
   
 
   
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
 	</div>

src/view/performance/caiqiebaogong.vue

@@ -1,23 +1,20 @@
 <template>
-	<div>
-	  <layout>
-		  <layout-content >
-		  <el-main>
-			<div class="gva-table-box">
-				<h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
-		      <el-row :gutter="24" style="margin-bottom: 20px;">
+  <div>
+	<layout>
+	  <layout-content >
+		<div class="gva-table-box">
+			<h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
+		      <el-row :gutter="24" style="margin-bottom: 5px;">
 		          <el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
 							  id="searchInput" 
-			  				  style="width: 270px;margin: 5px;height: 50px;">
+			  				  style="width: 230px;margin: 5px;height: 50px;">
 			  				  </el-input>
 			      <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
-				  
-				  
 		      </el-row>
 
 			  <el-row :gutter="24">
-		          <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
+		          <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 5px;">
 		              <el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
 		              <el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
 		              <el-input v-model="cmformdata.cm3" disabled style="width: 90px;height: 40px;"/>
@@ -33,7 +30,7 @@
 		      </el-row>
 		      
 		      <el-row :gutter="24">
-		          <el-form-item label="制单数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
+		          <el-form-item label="制单数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin:5px;">
 		              <el-input v-model="zdsformdata.zds1" disabled style="width: 90px;height: 40px;" id="zds1"/>
 		              <el-input v-model="zdsformdata.zds2" disabled style="width: 90px;height: 40px;" id="zds2"/>
 		              <el-input v-model="zdsformdata.zds3" disabled style="width: 90px;height: 40px;" id="zds3"/>
@@ -49,7 +46,7 @@
 		      </el-row>
 		      
 		      <el-row :gutter="24">
-		          <el-form-item label="实裁数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
+		          <el-form-item label="实裁数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 5px;">
 		              <el-input  v-model="scsformdata.scs1" style="width: 90px;height: 40px;" id="scs1" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
 		              <el-input  v-model="scsformdata.scs2" style="width: 90px;height: 40px;" id="scs2" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
 		              <el-input  v-model="scsformdata.scs3" style="width: 90px;height: 40px;" id="scs3"/>
@@ -66,8 +63,8 @@
 
 				<el-row :gutter="24" style="margin-bottom: 15px;">
 					<el-table ref="multipleTable" style="width: 100%;height: 41vh" tooltip-effect="dark"
-                      :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-                      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                      :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+                      :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
                       :data="add_tableData"  border row-key="ID"
                       size="small" 
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
@@ -75,16 +72,16 @@
                       @selection-change="handleSelectionChange">
 			  <!-- <el-table-column type="selection" width="55" /> -->
 			  <el-table-column  sortable  align="center" label="订单编号" prop="订单编号" width="120"/>
-              <el-table-column  sortable align="left" label="订单子编号" prop="子订单编号"  width="120"/>
+              <el-table-column  sortable align="left" label="订单子编号" prop="子订单编号"  width="130"/>
               <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="120" />
               <el-table-column  sortable  align="left" label="款式" prop="款式" width="110" />
               <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="80"  />
-              <el-table-column  sortable  align="left" label="制单总数" prop="制单总数" width="100" />
-              <el-table-column  sortable  align="left" label="实裁总数" prop="实裁总数" width="110" />
+              <el-table-column  sortable  align="left" label="制单总数" prop="zdtotal" width="110" />
+              <el-table-column  sortable  align="left" label="实裁总数" prop="sctotal" width="110" />
               <el-table-column  sortable  align="left" label="单位" prop="单位" width="80" />
-              <el-table-column  sortable  align="left" label="工序" prop="工序" width="80" />
-              <el-table-column  sortable  align="left" label="验片人" prop="验片人" width="90" />
-              <el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+              <!-- <el-table-column  sortable  align="left" label="工序" prop="工序" width="80" /> -->
+              <el-table-column  sortable  align="left" label="验片人" prop="Sys_id" width="100" />
+              <el-table-column  sortable  align="left" label="日期" prop="Sys_rq" width="160" />
             </el-table>
 			</el-row>
       <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
@@ -101,7 +98,7 @@
 				 </div>
 			   </el-dialog>
   
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
 	</div>
@@ -308,25 +305,32 @@ const add_Dialog = async ()=>{
   if(_order.value === ''){
     ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
   }else{
-    let params = {}
-    for (let i = 1; i <= 10; i++) {  
-    const key = `scs${i}`; // 动态构建键名  
-		if (scsformdata.hasOwnProperty(key)) { // 检查 scsformdata 是否包含该属性  
-			params[key] = scsformdata[key]; // 将属性复制到 params  
-		}  
-	}  
-	params.sctotal = scsformdata['sctotal'];
-    params.order = _order.value;
-    console.log(params)
-    // const ck_gettab = await getSpotTab(params);
-    // if (ck_gettab.code === 0) {
-    //   ElMessage({type: 'success',message: '出库成功'});
-    //     const getSpotToLists = await getSpotToList();
-    //     add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);//表格数据
-    //     add_searchInfo.value = ''
-    // } else {
-    //   ElMessage({ type: 'error',message: '出库失败'})
-    // }
+	if (_order.value.indexOf('-') !== -1) {
+	    let params = {}
+	    for (let i = 1; i <= 10; i++) {  
+	    const key = `scs${i}`; // 动态构建键名  
+	    	if (scsformdata.hasOwnProperty(key)) { // 检查 scsformdata 是否包含该属性  
+	    		params[key] = scsformdata[key]; // 将属性复制到 params  
+	    	}  
+	    }  
+	    params.sctotal = scsformdata['sctotal'];
+	    params.order = _order.value;//子订单编号
+	    params.rq = currentDates;//时间
+	    console.log(params)
+	    //裁切完工报工
+	    // const baogong_getInfo = await getInfo(params);
+	    // if (baogong_getInfo.code === 0) {
+	    //   ElMessage({type: 'success',message: '报工成功'});
+	    //     const getSpotToLists = await getSpotToList();
+	    //     add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);
+	    //     add_searchInfo.value = ''
+	    // } else {
+	    //   ElMessage({ type: 'error',message: '出库失败'})
+	    // }
+	} else {
+		ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
+	}
+    
   }
 }
 

src/view/performance/chukubaogong.vue

@@ -2,21 +2,23 @@
   <div>
     <layout>
       <layout-header>
-        <div class="">
-          <h1 style="margin: 0%;margin-bottom: 10px;">出库报工</h1>
-          <el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息" 
-			  				  @keyup.enter="add_onSubmit"
-							  id="searchInput" 
-			  				  style="width: 270px;margin: 5px;height: 50px;">
-			  				  </el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
-        </div>
+        <div class="gva-table-box">
+			<h1 style="margin: 0%;margin-bottom: 10px;">出库报工</h1>
+			<el-row :gutter="24" style="margin-bottom: 20px;">
+				<el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息" 
+								  @keyup.enter="add_onSubmit"
+								  id="searchInput" 
+								  style="width: 230px;margin: 5px;height: 50px;">
+								  </el-input>
+				  <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
+			</el-row>
+		</div>
       </layout-header>
       <layout>
         <layout-content >
         <el-main>
           <div class="gva-table-box">
-           <el-table ref="multipleTable" style="width: 100%;height: 60vh" tooltip-effect="dark"
+           <el-table ref="multipleTable" style="width: 100%;height: 55vh" tooltip-effect="dark"
                       :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="add_tableData"  border row-key="ID"
@@ -25,17 +27,15 @@
                       @row-click="add_tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
 			        <el-table-column type="selection" width="80" />
-              <el-table-column  sortable  align="left" label="订单编号" prop="订单编号" width="300" />
-              <el-table-column  sortable  align="left" label="订单子编号" prop="子订单编号" width="300"/>
-              <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="300" />
-              <el-table-column  sortable  align="left" label="款式" prop="款式" width="300" />
-              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="300"  />
-              <!-- <el-table-column  sortable  align="left" label="工序" prop="工序" width="150" />
-              <el-table-column  sortable  align="left" label="面料出库人" prop="面料出库人" width="150" />
-              <el-table-column  sortable  align="left" label="日期" prop="日期" width="160" /> -->
+              <el-table-column  sortable  align="left" label="订单编号" prop="订单编号" width="140" />
+              <el-table-column  sortable  align="left" label="订单子编号" prop="子订单编号" width="200"/>
+              <el-table-column  sortable  align="left" label="生产款号" prop="款号" width="200"/>
+              <el-table-column  sortable  align="left" label="款式" prop="款式" width="200"/>
+              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="200"/>
+			  <el-table-column  sortable  align="left" label="是否出库" prop="是否出库" width="200"/>
             </el-table>
             <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-						<el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+						<el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认出库</el-button>
 					</div>
           </div>
         </el-main>
@@ -102,7 +102,7 @@ const handleSelectionChange = (selection, type) => {
 //确认出库按钮
 const add_Dialog = async ()=>{
   if(ckSelection.value === ''){
-    ElMessage({type: 'warning',message: '请勾选具体的出库订单后，再操作此功能'})
+    ElMessage({type: 'warning',message: '请勾选出库订单后，再操作此功能'})
   }else{
     //复选框中子订单编号去重
     let params = {}

src/view/performance/datangbaogong.vue

@@ -2,7 +2,7 @@
 	<div>
 	  <layout>
 		  <layout-content >
-		  <el-main>
+		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">大烫报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
@@ -83,10 +83,7 @@
 						<el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
 					</div>
 			</div>
-  
-
-  
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
 	</div>

src/view/performance/houdaoshougong.vue

@@ -2,7 +2,7 @@
 	<div>
 	  <layout>
 		  <layout-content >
-		  <el-main>
+		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">后道（手工确认）</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
@@ -85,10 +85,7 @@
 						<el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
 					</div>
 			</div>
-  
-
-  
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
 	</div>
@@ -228,31 +225,31 @@ const add_Dialog = async ()=>{
   if(add_searchInfo.value === ''){
     ElMessage({type: 'warning',message: '请勾选具体的出库订单后，再操作此功能'})
   }else{
-			console.log(UniqId)
-			// 检查paramsList是否为空  
-			if (add_formData.数量 && add_formData.数量 !== '') {  
-				// 假设search函数可以处理一个包含多个参数的数组  
-				// 注意：如果search函数不支持数组，并且需要单独调用每个params，您可能需要使用Promise.all  
-				const cf_gettab = await search({UniqId:UniqId._value,code:'后道'}); // 调用search函数  
-				if (cf_gettab.code === 0) {
-					const firstPart = add_searchInfo.value.split(',')[0];  
-					const lsjltable = await getTab({order_id:firstPart,sczl_jtbh:add_formData['机台号']}); 
-					console.log(lsjltable)
-					add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
-					add_searchInfo.value = '';  
-					setTimeout(() => {
-						const inputElement = document.getElementById('searchInput');
-						if (inputElement) {
-							inputElement.focus();		
-						}
-					}, 100); // 延迟100毫秒
-					ElMessage({type: 'success', message: '报工成功'});  
-				} else {  
-					ElMessage({type: 'error', message: '报工失败'});  
-				}  
-			} else {  
-				ElMessage({type: 'info', message: '没有选中要报工的数据'});  
-			}
+	console.log(UniqId)
+	// 检查paramsList是否为空  
+	if (add_formData.数量 && add_formData.数量 !== '') {  
+		// 假设search函数可以处理一个包含多个参数的数组  
+		// 注意：如果search函数不支持数组，并且需要单独调用每个params，您可能需要使用Promise.all  
+		const cf_gettab = await search({UniqId:UniqId._value,code:'后道'}); // 调用search函数  
+		if (cf_gettab.code === 0) {
+			const firstPart = add_searchInfo.value.split(',')[0];  
+			const lsjltable = await getTab({order_id:firstPart,sczl_jtbh:add_formData['机台号']}); 
+			console.log(lsjltable)
+			add_tableData.splice(0,add_tableData.length,...lsjltable.data.records);
+			add_searchInfo.value = '';  
+			setTimeout(() => {
+				const inputElement = document.getElementById('searchInput');
+				if (inputElement) {
+					inputElement.focus();		
+				}
+			}, 100); // 延迟100毫秒
+			ElMessage({type: 'success', message: '报工成功'});  
+		} else {  
+			ElMessage({type: 'error', message: '报工失败'});  
+		}  
+	} else {  
+		ElMessage({type: 'info', message: '没有选中要报工的数据'});  
+	}
   }
 }
 	//  AttendanceVisible.value = false

src/view/performance/zongjianbaogong.vue

@@ -2,7 +2,7 @@
 	<div>
 	  <layout>
 		  <layout-content >
-		  <el-main>
+		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">总检报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
@@ -88,7 +88,7 @@
   
 
   
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 	  </layout>
 	</div>