zck 1 năm trước cách đây
mục cha
commit
22edc63a28

+ 64 - 0
src/api/mes/job.js

@@ -86,6 +86,16 @@ export const printDetailAdd = (data) => {
     data
   })
 }
+
+//工单附件新增
+export const gdAnnexAdd = (data) => {
+  return service({
+    url: '/mes_server/work_order/gdAnnexAdd',
+    method: 'post',
+    data
+  })
+}
+
 //订单资料删除
 export const orderDataDel = (params) => {
   return service({
@@ -122,6 +132,51 @@ export const getWorkOrder = (params) => {
   })
 }
 
+//获取子订单编号
+export const getSuborder = (params) => {
+  return service({
+    url: '/mes_server/work_order/getSuborder',
+    method: 'get',
+    params
+  })
+}
+
+//订单资料修改
+export const WorkOrderEdit = (data) => {
+  return service({
+    url: '/mes_server/work_order/WorkOrderEdit',
+    method: 'post',
+    data
+  })
+}
+
+//颜色资料修改
+export const PrintDataEdit = (data) => {
+  return service({
+    url: '/mes_server/work_order/PrintDataEdit',
+    method: 'post',
+    data
+  })
+}
+
+//图片上传
+export const upload = (data) => {
+  return service({
+    url: '/mes_server/common/upload',
+    method: 'post',
+    data
+  })
+}
+
+//车缝工序派工
+export const processAdd = (data) => {
+  return service({
+    url: '/mes_server/manufacture/processAdd',
+    method: 'post',
+    data
+  })
+}
+
 
 //车缝班组列表
 export const MachineList = (params) => {
@@ -140,6 +195,15 @@ export const MachineDetail = (params) => {
   })
 }
 
+//样衣核批
+export const Approval = (data) => {
+  return service({
+    url: '/mes_server/manufacture/Approval',
+    method: 'post',
+    data
+  })
+}
+
 //订单未审核列表
 export const UnapprovalList = (params) => {
   return service({

+ 1 - 1
src/view/layout/index.vue

@@ -17,7 +17,7 @@
           <img
             alt
             class="w-9 h-9 p-1 bg-white rounded-full"
-            :src="`/src/assets/dacheng.jpg`"
+            :src="`https://www.reachingkayo.com/Uploads/62f88d57efb9d749.jpg`"
           >
           <div
             v-if="isSider"

+ 71 - 52
src/view/performance/baozhuangbaogong.vue

@@ -7,69 +7,78 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">包装报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 0px;">
 		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 280px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 60px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
+					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
 					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
 					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
 					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
 					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
 					</el-form-item>
 		      </el-row>
 				
 				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 110px;height: 40px;" id="chima" />
+					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
+						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
 					</el-form-item>
-					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['数量']" readonly style="width: 110px;height: 40px;" id="shuliang" />
+					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
+						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
 					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px;" label-width="150">
+					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
+						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
+					</el-form-item>
+					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
 						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
 					</el-form-item>
-					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
+					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; 
+						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
 						 border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
 					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-20px; height: 50px; width: 70px; 
+						style="margin-top:-6px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
 						border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
 					</el-form-item>  
 				</el-row>  
 
-				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
-					<div @contextmenu.prevent>
-						 <el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
-							 :data="add_tableData" border row-key="ID" size="small"
-							 highlight-current-row="true" tooltip-effect="dark"
-							 @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-							 :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
-						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
-						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
-						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
-						  <el-table-column sortable align="left" label="组别" prop="组别" width="140"/>
-						  </el-table>
-				  </div>
-				</el-row>
+				<layout-content >
+					<el-main>
+						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
+							<div @contextmenu.prevent>
+								<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+									:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+									:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+									:data="add_tableData" border row-key="ID" size="small"
+									highlight-current-row="true" tooltip-effect="dark"
+									@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+									:show-overflow-tooltip="true" @selection-change="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"/>
+								</el-table>
+						</div>
+						</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;">确认</el-button>
 					</div>
@@ -187,17 +196,22 @@ const add_onSubmit = async ()=>{
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	if(searcs.value === ''){
+	add_formData['尺码'] = ''
+	add_formData['总数量'] = ''
+	add_formData['剩余数量'] = ''
+	add_formData['上报数量'] = ''
+	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
 		 //获取下面报工历史记录
 		 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:sys_sbID});
 		 activeButtonValue.value = getSpotLists.data.result.wb
 		 UniqId.value = getSpotLists.data.result.UniqId
-		 add_formData['数量'] = getSpotLists.data.result.sl
 		 add_formData['尺码'] = getSpotLists.data.result.cm
+		 add_formData['总数量'] = getSpotLists.data.result.sl
+		 add_formData['剩余数量'] = getSpotLists.data.result.ci_num
 		 add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
-		 searcs.value = 1;
+		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
 		const inputElement = document.getElementById('sbsl');
@@ -206,9 +220,9 @@ const add_onSubmit = async ()=>{
 		}
 	}, 100); // 延迟100毫秒
 		 
-	}else{
-		 add_Dialog();
-	}
+	// }else{
+	// 	 add_Dialog();
+	// }
   }
 }
 const AttendanceVisible=ref(false)
@@ -225,6 +239,7 @@ const add_formData = reactive({
 	人员: '',	
 	尺码: '',
 	数量: '',
+	剩余数量: '',
 	上报数量:'',
 	是否订单尾包: '',
 
@@ -233,9 +248,9 @@ const add_Dialogonclick = ref(false)
 function baogongslpd() {    
   // 将字符串转换为数字  
   const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制,如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['数量'], 10) || 0; // 同样处理  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
   if (reportedQuantity > totalQuantity) {  
-    ElMessage({ type: 'warning', message: '上报数量不能大于数量' });  
+    ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
@@ -248,7 +263,6 @@ const add_Dialog = async ()=>{
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
   }else{
 		console.log(_order.value.split(',')[0])
-
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]
@@ -262,16 +276,19 @@ const add_Dialog = async ()=>{
 		params.wb =  _order.value.split(',')[5]
 		params.sys_id = add_formData['人员']
 		params.UniqId = UniqId.value
-		params.num = add_formData['上报数量']
-		
+		params.s_num = add_formData['上报数量']
+		params.ci_num = add_formData['剩余数量']
 		console.log(params)
 		// 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:firstPart,sczl_jtbh:add_formData['机台号']}); 
-			console.log(lsjltable)
+			// 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_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
@@ -279,11 +296,12 @@ const add_Dialog = async ()=>{
 					inputElement.focus();		
 				}
 			}, 100); // 延迟100毫秒
-			searcs.value = '';
+			// searcs.value = '';
 			add_formData['尺码']=''
 			add_formData['数量']=''
 			add_formData['上报数量']=''
-			
+		//  searcs.value = 1;
+		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
 
@@ -478,6 +496,7 @@ margin: 0px !important;
 }
 .gva-table-box{
 padding: 0px !important;
+margin-left: -10px !important;
 }
 .mab{
 margin-bottom: 5px;

+ 123 - 88
src/view/performance/caiqiebaogong.vue

@@ -8,53 +8,72 @@
 			</div>
 		      <el-row :gutter="24">
 		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit"id="searchInput" 
-				  style="width: 280px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 60px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
+				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
+					<el-form-item label="机台号" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+					    <el-input v-model="add_formData['机台号']" readonly style="width: 90px; height: 40px;" id="jitaihao" />
 					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="工序" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
 					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
 					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="组别" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
 					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
 					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="人员" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
 					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
 					</el-form-item>
 		      </el-row>
 
 			  <el-row :gutter="24">
-		          <el-form-item label="尺码/制单数合计:" class="mab"  prop="keyOrder" label-width="240" style="font-size: 28px;">
-		              <el-input v-model="cmformdata.cm1"  id="cm1"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm2"  id="cm2"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm3"  id="cm3"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm4"  id="cm4"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm5"  id="cm5"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm6"  id="cm6"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm7"  id="cm7"  readonly style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm8"  id="cm8"  readonly style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm9"  id="cm9"  readonly style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 90px;height: 40px;"/>
+		          <el-form-item label="尺码" class="mab"  prop="keyOrder" label-width="200" style="font-size: 28px;">
+		              <el-input v-model="cmformdata.cm1"  id="cm1"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm2"  id="cm2"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm3"  id="cm3"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm4"  id="cm4"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm5"  id="cm5"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm6"  id="cm6"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm7"  id="cm7"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmformdata.cm8"  id="cm8"  readonly style="width: 70px;height: 40px;"/>
+					        <el-input v-model="cmformdata.cm9"  id="cm9"  readonly style="width: 70px;height: 40px;"/>	
+		              <el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 70px;height: 40px;"/>
+					        <el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 70px;height: 40px;"/>
+		          </el-form-item>
+		      </el-row>
+
+          <el-row :gutter="24">
+		          <el-form-item label="制单数" class="mab"  prop="keyOrder" label-width="200" style="font-size: 28px;">
+		              <el-input v-model="cmslformdata.cmsl1"  id="cmsl1"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl2"  id="cmsl2"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl3"  id="cmsl3"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl4"  id="cmsl4"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl5"  id="cmsl5"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl6"  id="cmsl6"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl7"  id="cmsl7"  readonly style="width: 70px;height: 40px;"/>
+		              <el-input v-model="cmslformdata.cmsl8"  id="cmsl8"  readonly style="width: 70px;height: 40px;"/>
+					        <el-input v-model="cmslformdata.cmsl9"  id="cmsl9"  readonly style="width: 70px;height: 40px;"/>	
+		              <el-input v-model="cmslformdata.cmsl10" id="cmsl10" readonly style="width: 70px;height: 40px;"/>
+					        <el-input v-model="cmslformdata.zdtotal" id="zdtotal" readonly style="width: 70px;height: 40px;"/>
 		          </el-form-item>
 		      </el-row>
 		      
 		      <el-row :gutter="24">
-		          <el-form-item label="本次实裁新增:" class="mab" prop="keyOrder" label-width="240" style="font-size: 28px;">
-					<el-input  v-model="scsformdata.scs1"  id="scs1"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
-					<el-input  v-model="scsformdata.scs2"  id="scs2"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
-					<el-input  v-model="scsformdata.scs3"  id="scs3"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs2', 'scs3', 'scs4')"/>
-					<el-input  v-model="scsformdata.scs4"  id="scs4"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs3', 'scs4', 'scs5')"/>
-					<el-input  v-model="scsformdata.scs5"  id="scs5"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs4', 'scs5', 'scs6')"/>
-					<el-input  v-model="scsformdata.scs6"  id="scs6"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs5', 'scs6', 'scs7')"/>
-					<el-input  v-model="scsformdata.scs7"  id="scs7"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs6', 'scs7', 'scs8')"/>
-					<el-input  v-model="scsformdata.scs8"  id="scs8"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs7', 'scs8', 'scs9')"/>
-					<el-input  v-model="scsformdata.scs9"  id="scs9"  @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs8', 'scs9', 'scs10')"/>
-					<el-input  v-model="scsformdata.scs10" id="scs10" @input="updateTotal" style="width: 90px;height: 40px;" @keydown="handleKeyDown($event, 'scs9', 'scs10', 'scs1')"/>
-					<el-input  v-model="scsformdata.sctotal" readonly style="width: 90px;height: 40px;" id="sctotal"/>
+		          <el-form-item label="新增实裁数" class="mab" prop="keyOrder" label-width="200" style="font-size: 28px;">
+					<el-input  v-model="scsformdata.scs1"  id="scs1"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
+					<el-input  v-model="scsformdata.scs2"  id="scs2"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
+					<el-input  v-model="scsformdata.scs3"  id="scs3"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs2', 'scs3', 'scs4')"/>
+					<el-input  v-model="scsformdata.scs4"  id="scs4"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs3', 'scs4', 'scs5')"/>
+					<el-input  v-model="scsformdata.scs5"  id="scs5"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs4', 'scs5', 'scs6')"/>
+					<el-input  v-model="scsformdata.scs6"  id="scs6"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs5', 'scs6', 'scs7')"/>
+					<el-input  v-model="scsformdata.scs7"  id="scs7"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs6', 'scs7', 'scs8')"/>
+					<el-input  v-model="scsformdata.scs8"  id="scs8"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs7', 'scs8', 'scs9')"/>
+					<el-input  v-model="scsformdata.scs9"  id="scs9"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs8', 'scs9', 'scs10')"/>
+					<el-input  v-model="scsformdata.scs10" id="scs10" @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs9', 'scs10', 'scs1')"/>
+					<el-input  v-model="scsformdata.sctotal" readonly style="width: 70px;height: 40px;" id="sctotal"/>
+          <el-button type="primary" @click="add_Dialog" 	 style="width: 100px;height: 60px;font-size: 20px;">确认</el-button>
+          <el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
 		          </el-form-item>
 		      </el-row>
+          
 
 				<el-row :gutter="24" style="margin-bottom: 15px;">
 					<el-table ref="multipleTable" style="width: 100%;height: 52vh" tooltip-effect="dark"
@@ -79,9 +98,7 @@
               <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;">
-						<el-button type="primary" @click="add_Dialog" 	 style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
-					</div>
+
 			</div>
   
 			  <!-- 是否订单尾包确认弹窗 -->
@@ -93,9 +110,15 @@
 				 </div>
 			   </el-dialog>
   
+         <el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
+			  <div id="luckyexcel" style="width: 100%;height: 100vh;"></div>
+			</el-dialog>
+
+        </layout-content>
+      </layout>
+
+    <PrintPage ref="printPageRef" />
 		  <!-- </el-main> -->
-		</layout-content>
-	  </layout>
 	</div>
   </template>
 <script>
@@ -153,24 +176,14 @@ export default {
 <script setup>
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
-
-import {ref, reactive} from 'vue'
-import {getSpotList,getInfo,getMachineMac} from '@/api/mes/job'
+import {ref, reactive} from 'vue';
+import {getSpotList,getInfo,getMachineMac} from '@/api/mes/job';
 import {ElMessage} from "element-plus";
+import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
 defineOptions({name: 'Company'})
+const printPageRef = ref()
 
-//
-const add_formData = reactive({
-	机台号: '',	
-	工序: '',
-	组别: '',
-	人员: '',	
-	尺码: '',
-	数量: '',
-	是否订单尾包: '',
-  });
-
-
+const add_searchInfo = ref('DC2409007-01')
 //全局接口接受的物理地址
 const Machine = '70-ED-A4-26-5F-32'
 //全局获取code,接口接收code
@@ -187,11 +200,19 @@ const getMachineMacdata = async () => {
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
 	add_formData['人员'] = data.data['组长']
+  setTimeout(() => {
+				const inputElement = document.getElementById('searchInput');
+				if (inputElement) {
+					inputElement.focus();		
+				}
+			}, 100); // 延迟100毫秒
   } catch (error) {
     console.error(error)
   }
 }
 getMachineMacdata();
+
+
 //全局调用获取当前日期
 const today = new Date();
 const year = today.getFullYear();
@@ -203,8 +224,15 @@ const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
 
-
-const add_searchInfo = ref('')
+const add_formData = reactive({
+  机台号: '',	
+  工序: '',
+  组别: '',
+  人员: '',	
+  尺码: '',
+  数量: '',
+  是否订单尾包: '',
+});
 //清空对象的属性值
 const gd_clearFormData = () => {
   Object.keys(add_formData).forEach(key => {
@@ -225,19 +253,20 @@ const cmformdata = reactive({
   cm10:'',
   cm11:'合计',
 });
+
 // 制单数
-const zdsformdata = reactive({
-  scs1: 0,  
-  scs2: 0,  
-  scs3: 0,  
-  scs4: 0,  
-  scs5: 0,  
-  scs6: 0,  
-  scs7: 0,  
-  scs8: 0,  
-  scs9: 0,  
-  scs10: 0,  
-  sctotal: 0 
+const cmslformdata = reactive({
+  cmsl1: '',  
+  cmsl2: '',  
+  cmsl3: '',  
+  cmsl4: '',  
+  cmsl5: '',  
+  cmsl6: '',  
+  cmsl7: '',  
+  cmsl8: '',  
+  cmsl9: '',  
+  cmsl10: '',  
+  zdtotal: '' 
 });
 // 实裁数
 const scsformdata = reactive({
@@ -280,13 +309,18 @@ const add_onSubmit = async ()=>{
 	add_tableData.value = getSpotLists.data.data;
   _UniqId.value = getSpotLists.data.list[0].UniqId
 	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10','cm11',];
-	// const keys2 = ['zds1', 'zds2', 'zds3', 'zds4','zds5','zds6','zds7','zds8','zds9','zds10','zdtotal',];
+	const keys2 = ['cmsl1', 'cmsl2', 'cmsl3', 'cmsl4','cmsl5','cmsl6','cmsl7','cmsl8','cmsl9','cmsl10','zdtotal',];
 	if(order.includes('-')){
 		for (let key of keys1) {  
 			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
 				cmformdata[key] = getSpotLists.data.list[0][key];  
 			}  
 		}  
+    for (let key of keys2) {  
+			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
+				cmslformdata[key] = getSpotLists.data.list[0][key];  
+			}  
+		} 
 		setTimeout(() => {
         const inputElement = document.getElementById('scs1');
         if (inputElement) {
@@ -298,7 +332,7 @@ const add_onSubmit = async ()=>{
 			cmformdata[key] = '';  
 		}  
 		for (let key of keys2) {  
-			zdsformdata[key] = '';  
+			cmslformdata[key] = '';  
 		}   
 	}
     setTimeout(() => {
@@ -358,6 +392,15 @@ const add_Dialog = async ()=>{
   }
 }
 
+const gd_yulan = () => {
+  if(add_searchInfo.value === '' || add_searchInfo.value === null){
+    ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
+    return false;
+  }else{
+    const order = add_searchInfo.value.split('-')[0]
+      printPageRef.value.open(order) 
+  }
+}
 
 // =========== 分页 ===========
 // 分页相关的响应式变量
@@ -474,6 +517,7 @@ const handleSizeChange = (val) => {
 }
 .gva-table-box{
   padding: 0px !important;
+	margin-left: -10px !important;
 }
 .mab{
   margin-bottom: 5px;
@@ -506,90 +550,81 @@ const handleSizeChange = (val) => {
 /* 尺码/制单数合计样式 */
 ::v-deep .el-input__wrapper  #cm1{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm2{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm3{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm4{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm5{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm6{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm7{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm8{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm9{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm10{
 	font-size: 20px; 
-	color: red !important;
 }
 ::v-deep .el-input__wrapper  #cm11{
 	font-size: 20px; 
 }
 /* 本次实裁新增样式 */
-::v-deep .el-input__wrapper  #scs1{
+::v-deep .el-input__wrapper  #cmsl1{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs2{
+::v-deep .el-input__wrapper  #cmsl2{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs3{
+::v-deep .el-input__wrapper  #cmsl3{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs4{
+::v-deep .el-input__wrapper  #cmsl4{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs5{
+::v-deep .el-input__wrapper  #cmsl5{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs6{
+::v-deep .el-input__wrapper  #cmsl6{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs7{
+::v-deep .el-input__wrapper  #cmsl7{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs8{
+::v-deep .el-input__wrapper  #cmsl8{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs9{
+::v-deep .el-input__wrapper  #cmsl9{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #scs10{
+::v-deep .el-input__wrapper  #cmsl10{
 	font-size: 20px; 
 	color: red !important;
 }
-::v-deep .el-input__wrapper  #sctotal{
+::v-deep .el-input__wrapper  #zdtotal{
 	font-size: 20px; 
+  color: red !important;
 }
 
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 208 - 134
src/view/performance/chafengbaogong.vue


+ 22 - 10
src/view/performance/chukubaogong.vue

@@ -7,11 +7,11 @@
 			<el-row :gutter="24" style="margin-bottom: 6px;">
 				  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"
 				  			  @keyup.enter="add_onSubmit"
-								id="searchInput" 
-				  			  style="width: 280px;margin: 5px;height: 50px;margin-left: 10px;">
+								  id="searchInput" 
+				  			  style="width: 220px;height: 50px;margin-left: 10px;">
 				  			  </el-input>
-				  <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
-				  <el-button type="primary" icon="" @click="Restore_onSubmit" style="margin: 5px;height: 50px;">恢复未出库</el-button>
+				  <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;">查询</el-button>
+				  <el-button type="primary" icon="" @click="Restore_onSubmit" style="height: 50px;">恢复未出库</el-button>
 			</el-row>
 		</div>
       <!-- </layout-header> -->
@@ -28,12 +28,12 @@
                       @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="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-column  sortable  align="left" label="订单编号" prop="订单编号" width="120" />
+              <el-table-column  sortable  align="left" label="订单子编号" prop="子订单编号" width="140"/>
+              <el-table-column  sortable  align="left" label="生产款号" prop="款号" width="220"/>
+              <el-table-column  sortable  align="left" label="款式" prop="款式" width="100"/>
+              <el-table-column  sortable  align="left" label="色系名称" prop="颜色" width="150"/>
+			  <el-table-column  sortable  align="left" label="是否出库" prop="是否出库" width="120"/>
             </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;display: none;">确认出库</el-button>
@@ -69,6 +69,16 @@ const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
 
+const getMachineMacdata = async () => {
+	setTimeout(() => {
+				const inputElement = document.getElementById('searchInput');
+				if (inputElement) {
+					inputElement.focus();		
+				}
+			}, 100); // 延迟100毫秒
+}
+getMachineMacdata();
+
 const add_searchInfo = ref('')//搜索
 const add_tableData = reactive([])//表格
 const _orderid = ref('')//订单自编号
@@ -350,6 +360,7 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
 }
 .gva-table-box{
   padding: 0px !important;
+	margin-left: 5px !important;
 }
 .mab{
   margin-bottom: 5px;
@@ -358,4 +369,5 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
 ::v-deep .el-input__wrapper #searchInput {  
   font-size: 16px; 
 }  
+
 </style>

+ 72 - 53
src/view/performance/datangbaogong.vue

@@ -4,72 +4,81 @@
 		  <layout-content >
 		  <!-- <el-main> -->
 			<div class="gva-table-box">
-				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">后道(手工确认)</h1>
+				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">大烫报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 0px;">
 		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 280px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 60px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
+					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
 					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
 					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
 					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
 					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
 					</el-form-item>
 		      </el-row>
 				
 				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 110px;height: 40px;" id="chima" />
+					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
+						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
 					</el-form-item>
-					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['数量']" readonly style="width: 110px;height: 40px;" id="shuliang" />
+					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
+						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
 					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px;" label-width="150">
+					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
+						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
+					</el-form-item>
+					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
 						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
 					</el-form-item>
-					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
+					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; 
+						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
 						 border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
 					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-20px; height: 50px; width: 70px; 
+						style="margin-top:-6px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
 						border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
 					</el-form-item>  
 				</el-row>  
 
-				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
-					<div @contextmenu.prevent>
-						 <el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
-							 :data="add_tableData" border row-key="ID" size="small"
-							 highlight-current-row="true" tooltip-effect="dark"
-							 @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-							 :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
-						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
-						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
-						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
-						  <el-table-column sortable align="left" label="组别" prop="组别" width="140"/>
-						  </el-table>
-				  </div>
-				</el-row>
+				<layout-content >
+					<el-main>
+						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
+							<div @contextmenu.prevent>
+								<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+									:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+									:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+									:data="add_tableData" border row-key="ID" size="small"
+									highlight-current-row="true" tooltip-effect="dark"
+									@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+									:show-overflow-tooltip="true" @selection-change="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"/>
+								</el-table>
+						</div>
+						</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;">确认</el-button>
 					</div>
@@ -187,17 +196,22 @@ const add_onSubmit = async ()=>{
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	if(searcs.value === ''){
+	add_formData['尺码'] = ''
+	add_formData['总数量'] = ''
+	add_formData['剩余数量'] = ''
+	add_formData['上报数量'] = ''
+	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
 		 //获取下面报工历史记录
 		 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:sys_sbID});
 		 activeButtonValue.value = getSpotLists.data.result.wb
 		 UniqId.value = getSpotLists.data.result.UniqId
-		 add_formData['数量'] = getSpotLists.data.result.sl
 		 add_formData['尺码'] = getSpotLists.data.result.cm
+		 add_formData['总数量'] = getSpotLists.data.result.sl
+		 add_formData['剩余数量'] = getSpotLists.data.result.ci_num
 		 add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
-		 searcs.value = 1;
+		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
 		const inputElement = document.getElementById('sbsl');
@@ -206,9 +220,9 @@ const add_onSubmit = async ()=>{
 		}
 	}, 100); // 延迟100毫秒
 		 
-	}else{
-		 add_Dialog();
-	}
+	// }else{
+	// 	 add_Dialog();
+	// }
   }
 }
 const AttendanceVisible=ref(false)
@@ -225,6 +239,7 @@ const add_formData = reactive({
 	人员: '',	
 	尺码: '',
 	数量: '',
+	剩余数量: '',
 	上报数量:'',
 	是否订单尾包: '',
 
@@ -233,9 +248,9 @@ const add_Dialogonclick = ref(false)
 function baogongslpd() {    
   // 将字符串转换为数字  
   const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制,如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['数量'], 10) || 0; // 同样处理  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
   if (reportedQuantity > totalQuantity) {  
-    ElMessage({ type: 'warning', message: '上报数量不能大于数量' });  
+    ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
@@ -248,7 +263,6 @@ const add_Dialog = async ()=>{
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
   }else{
 		console.log(_order.value.split(',')[0])
-
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]
@@ -262,16 +276,19 @@ const add_Dialog = async ()=>{
 		params.wb =  _order.value.split(',')[5]
 		params.sys_id = add_formData['人员']
 		params.UniqId = UniqId.value
-		params.num = add_formData['上报数量']
-		
+		params.s_num = add_formData['上报数量']
+		params.ci_num = add_formData['剩余数量']
 		console.log(params)
 		// 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:firstPart,sczl_jtbh:add_formData['机台号']}); 
-			console.log(lsjltable)
+			// 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_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
@@ -279,11 +296,12 @@ const add_Dialog = async ()=>{
 					inputElement.focus();		
 				}
 			}, 100); // 延迟100毫秒
-			searcs.value = '';
+			// searcs.value = '';
 			add_formData['尺码']=''
 			add_formData['数量']=''
 			add_formData['上报数量']=''
-			
+		//  searcs.value = 1;
+		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
 
@@ -478,6 +496,7 @@ margin: 0px !important;
 }
 .gva-table-box{
 padding: 0px !important;
+margin-left: -10px !important;
 }
 .mab{
 margin-bottom: 5px;

+ 71 - 52
src/view/performance/houdaoshougong.vue

@@ -7,69 +7,78 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">后道(手工确认)</h1>
 				<el-row :gutter="24" style="margin-bottom: 0px;">
 		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 280px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 60px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
+					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
 					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
 					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
 					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
 					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
 					</el-form-item>
 		      </el-row>
 				
 				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 110px;height: 40px;" id="chima" />
+					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
+						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
 					</el-form-item>
-					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['数量']" readonly style="width: 110px;height: 40px;" id="shuliang" />
+					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
+						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
 					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px;" label-width="150">
+					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
+						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
+					</el-form-item>
+					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
 						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
 					</el-form-item>
-					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
+					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; 
+						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
 						 border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
 					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-20px; height: 50px; width: 70px; 
+						style="margin-top:-6px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
 						border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
 					</el-form-item>  
 				</el-row>  
 
-				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
-					<div @contextmenu.prevent>
-						 <el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
-							 :data="add_tableData" border row-key="ID" size="small"
-							 highlight-current-row="true" tooltip-effect="dark"
-							 @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-							 :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
-						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
-						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
-						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
-						  <el-table-column sortable align="left" label="组别" prop="组别" width="140"/>
-						  </el-table>
-				  </div>
-				</el-row>
+				<layout-content >
+					<el-main>
+						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
+							<div @contextmenu.prevent>
+								<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+									:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+									:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+									:data="add_tableData" border row-key="ID" size="small"
+									highlight-current-row="true" tooltip-effect="dark"
+									@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+									:show-overflow-tooltip="true" @selection-change="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"/>
+								</el-table>
+						</div>
+						</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;">确认</el-button>
 					</div>
@@ -187,17 +196,22 @@ const add_onSubmit = async ()=>{
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	if(searcs.value === ''){
+	add_formData['尺码'] = ''
+	add_formData['总数量'] = ''
+	add_formData['剩余数量'] = ''
+	add_formData['上报数量'] = ''
+	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
 		 //获取下面报工历史记录
 		 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:sys_sbID});
 		 activeButtonValue.value = getSpotLists.data.result.wb
 		 UniqId.value = getSpotLists.data.result.UniqId
-		 add_formData['数量'] = getSpotLists.data.result.sl
 		 add_formData['尺码'] = getSpotLists.data.result.cm
+		 add_formData['总数量'] = getSpotLists.data.result.sl
+		 add_formData['剩余数量'] = getSpotLists.data.result.ci_num
 		 add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
-		 searcs.value = 1;
+		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
 		const inputElement = document.getElementById('sbsl');
@@ -206,9 +220,9 @@ const add_onSubmit = async ()=>{
 		}
 	}, 100); // 延迟100毫秒
 		 
-	}else{
-		 add_Dialog();
-	}
+	// }else{
+	// 	 add_Dialog();
+	// }
   }
 }
 const AttendanceVisible=ref(false)
@@ -225,6 +239,7 @@ const add_formData = reactive({
 	人员: '',	
 	尺码: '',
 	数量: '',
+	剩余数量: '',
 	上报数量:'',
 	是否订单尾包: '',
 
@@ -233,9 +248,9 @@ const add_Dialogonclick = ref(false)
 function baogongslpd() {    
   // 将字符串转换为数字  
   const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制,如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['数量'], 10) || 0; // 同样处理  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
   if (reportedQuantity > totalQuantity) {  
-    ElMessage({ type: 'warning', message: '上报数量不能大于数量' });  
+    ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
@@ -248,7 +263,6 @@ const add_Dialog = async ()=>{
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
   }else{
 		console.log(_order.value.split(',')[0])
-
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]
@@ -262,16 +276,19 @@ const add_Dialog = async ()=>{
 		params.wb =  _order.value.split(',')[5]
 		params.sys_id = add_formData['人员']
 		params.UniqId = UniqId.value
-		params.num = add_formData['上报数量']
-		
+		params.s_num = add_formData['上报数量']
+		params.ci_num = add_formData['剩余数量']
 		console.log(params)
 		// 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:firstPart,sczl_jtbh:add_formData['机台号']}); 
-			console.log(lsjltable)
+			// 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_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
@@ -279,11 +296,12 @@ const add_Dialog = async ()=>{
 					inputElement.focus();		
 				}
 			}, 100); // 延迟100毫秒
-			searcs.value = '';
+			// searcs.value = '';
 			add_formData['尺码']=''
 			add_formData['数量']=''
 			add_formData['上报数量']=''
-			
+		//  searcs.value = 1;
+		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
 
@@ -478,6 +496,7 @@ margin: 0px !important;
 }
 .gva-table-box{
 padding: 0px !important;
+margin-left: -10px !important;
 }
 .mab{
 margin-bottom: 5px;

+ 71 - 52
src/view/performance/zongjianbaogong.vue

@@ -7,69 +7,78 @@
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">总检报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 0px;">
 		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 280px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 60px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
+					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
 					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
 					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
 					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
 					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
 					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
 					</el-form-item>
 		      </el-row>
 				
 				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 110px;height: 40px;" id="chima" />
+					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
+						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
 					</el-form-item>
-					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
-						<el-input v-model="add_formData['数量']" readonly style="width: 110px;height: 40px;" id="shuliang" />
+					<el-form-item label="数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
+						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
 					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px;" label-width="150">
+					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
+						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
+					</el-form-item>
+					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
 						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
 					</el-form-item>
-					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
+					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; 
+						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
 						 border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
 					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-20px; height: 50px; width: 70px; 
+						style="margin-top:-6px; height: 50px; width: 60px; 
 						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
 						border-radius: 4px; color: #000000; font-size: 24px;"    
 						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
 					</el-form-item>  
 				</el-row>  
 
-				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
-					<div @contextmenu.prevent>
-						 <el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
-							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
-							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
-							 :data="add_tableData" border row-key="ID" size="small"
-							 highlight-current-row="true" tooltip-effect="dark"
-							 @row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
-							 :show-overflow-tooltip="true" @selection-change="add_xpSelectionChange">
-						  <el-table-column type="selection" width="70" />
-						  <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="订单子编号" prop="子订单编号" width="140"/>
-						  <el-table-column sortable align="left" label="生产款号" prop="款号" width="140"/>
-						  <el-table-column sortable align="left" label="款式" prop="款式" width="140"/>
-						  <el-table-column sortable align="left" label="色系名称" prop="颜色" width="140"/>
-						  <el-table-column sortable align="left" label="尺码" prop="尺码" width="140"/>
-						  <el-table-column sortable align="left" label="数量" prop="数量" width="140"/>
-						  <el-table-column sortable align="left" label="是否尾包" prop="尾包" width="140"/>
-						  <el-table-column sortable align="left" label="组别" prop="组别" width="140"/>
-						  </el-table>
-				  </div>
-				</el-row>
+				<layout-content >
+					<el-main>
+						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
+							<div @contextmenu.prevent>
+								<el-table ref="multipleTableRef" style="width: 100%;height: 53vh"
+									:row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
+									:cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
+									:data="add_tableData" border row-key="ID" size="small"
+									highlight-current-row="true" tooltip-effect="dark"
+									@row-dblclick="add_updateCompanyFunc" @row-click="add_tableRowClick" @row-contextmenu="handleRightClick"
+									:show-overflow-tooltip="true" @selection-change="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"/>
+								</el-table>
+						</div>
+						</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;">确认</el-button>
 					</div>
@@ -187,17 +196,22 @@ const add_onSubmit = async ()=>{
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
 	ElMessage({type: 'warning',message: '请扫描小票二维码' })
   }else{
-	if(searcs.value === ''){
+	add_formData['尺码'] = ''
+	add_formData['总数量'] = ''
+	add_formData['剩余数量'] = ''
+	add_formData['上报数量'] = ''
+	// if(searcs.value === ''){
 		 _order.value = add_searchInfo.value;
 		 const sys_sbID = add_formData['机台号']
 		 //获取下面报工历史记录
 		 const getSpotLists = await getSpotList({order:add_searchInfo.value,code:_code,sys_sbID:sys_sbID});
 		 activeButtonValue.value = getSpotLists.data.result.wb
 		 UniqId.value = getSpotLists.data.result.UniqId
-		 add_formData['数量'] = getSpotLists.data.result.sl
 		 add_formData['尺码'] = getSpotLists.data.result.cm
+		 add_formData['总数量'] = getSpotLists.data.result.sl
+		 add_formData['剩余数量'] = getSpotLists.data.result.ci_num
 		 add_tableData.splice(0,add_tableData.length,...getSpotLists.data.records);
-		 searcs.value = 1;
+		//  searcs.value = 1;
 		 add_searchInfo.value = ''
 		 setTimeout(() => {
 		const inputElement = document.getElementById('sbsl');
@@ -206,9 +220,9 @@ const add_onSubmit = async ()=>{
 		}
 	}, 100); // 延迟100毫秒
 		 
-	}else{
-		 add_Dialog();
-	}
+	// }else{
+	// 	 add_Dialog();
+	// }
   }
 }
 const AttendanceVisible=ref(false)
@@ -225,6 +239,7 @@ const add_formData = reactive({
 	人员: '',	
 	尺码: '',
 	数量: '',
+	剩余数量: '',
 	上报数量:'',
 	是否订单尾包: '',
 
@@ -233,9 +248,9 @@ const add_Dialogonclick = ref(false)
 function baogongslpd() {    
   // 将字符串转换为数字  
   const reportedQuantity = parseInt(add_formData['上报数量'], 10) || 0; // 使用10作为基数表示十进制,如果转换失败则返回0  
-  const totalQuantity = parseInt(add_formData['数量'], 10) || 0; // 同样处理  
+  const totalQuantity = parseInt(add_formData['剩余数量'], 10) || 0; // 同样处理  
   if (reportedQuantity > totalQuantity) {  
-    ElMessage({ type: 'warning', message: '上报数量不能大于数量' });  
+    ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
@@ -248,7 +263,6 @@ const add_Dialog = async ()=>{
     ElMessage({type: 'warning',message: '请重新扫描小票二维码'})
   }else{
 		console.log(_order.value.split(',')[0])
-
 		let params ={}
 		params.code = _code
 		params.order = _order.value.split(',')[0].split('-')[0]
@@ -262,16 +276,19 @@ const add_Dialog = async ()=>{
 		params.wb =  _order.value.split(',')[5]
 		params.sys_id = add_formData['人员']
 		params.UniqId = UniqId.value
-		params.num = add_formData['上报数量']
-		
+		params.s_num = add_formData['上报数量']
+		params.ci_num = add_formData['剩余数量']
 		console.log(params)
 		// 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:firstPart,sczl_jtbh:add_formData['机台号']}); 
-			console.log(lsjltable)
+			// 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_searchInfo.value = '';  
 			setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
@@ -279,11 +296,12 @@ const add_Dialog = async ()=>{
 					inputElement.focus();		
 				}
 			}, 100); // 延迟100毫秒
-			searcs.value = '';
+			// searcs.value = '';
 			add_formData['尺码']=''
 			add_formData['数量']=''
 			add_formData['上报数量']=''
-			
+		//  searcs.value = 1;
+		 add_searchInfo.value = ''
 			ElMessage({type: 'success', message: '报工成功'});  
 		}
 
@@ -478,6 +496,7 @@ margin: 0px !important;
 }
 .gva-table-box{
 padding: 0px !important;
+margin-left: -10px !important;
 }
 .mab{
 margin-bottom: 5px;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 45 - 270
src/view/yunyin/shengchanguanli/components/addGongYi.vue


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
src/view/yunyin/shengchanguanli/components/print.vue


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 486 - 388
src/view/yunyin/shengchanguanli/gongdanziliao.vue


+ 2 - 2
src/view/yunyin/shengchanguanli/gongxuchanlianghecha.vue

@@ -4,9 +4,9 @@
       <layout-header>
         <div class="">
           <!--按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit()">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
+              <el-input v-model="searchInfo" placeholder="搜索" style="width: 180px;"></el-input>
               <el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
             </el-form-item>
           </el-form>

+ 3 - 0
src/view/yunyin/shengchanguanli/shengchanpaichan.vue

@@ -250,6 +250,8 @@
                   <el-form-item label="颜色:" class="mab" prop="keyOrder">
                     <el-input v-model="add_yjzlformdata.ys" style="width: 100px;margin-bottom: 12px;" id="ys" @keydown="add_gdzlent($event, 'ddzbh', 'ys', '尺码规格')"/>
                   </el-form-item>
+                </div>
+                <div style="display: flex; gap: 0px;">
                   <el-form-item label="尺码规格:" prop="joinDate" >
                     <el-select v-model="add_yjzlformdata.cmgg" style="width: 150px;" id="尺码规格" @keydown="add_gdzlent($event, 'ys', '尺码规格', '工作中心')">
                       <el-option label="32~46" value="32~46"></el-option>
@@ -263,6 +265,7 @@
                     </el-select>
                   </el-form-item>
                 </div>
+
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="尺码:" class="mab" prop="keyOrder">
                     <el-input v-model="cmformdata.cm1" readonly style="width: 80px;"/>

+ 88 - 36
src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -6,9 +6,9 @@
 			<!--          按钮部分-->
 			<el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
 			  <el-form-item>
-				<el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
+				<el-input v-model="searchInfo" placeholder="搜索"  style="width: 180px;"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
-				<el-button type="primary" icon="edit"   @click="hptg_onClick" class="bt" title="核批通过" disabled>核批通过</el-button>
+				<el-button type="primary" icon="edit"   @click="hptg_onClick" :disabled="table_Selection === false"  class="bt" title="核批通过">核批通过</el-button>
 			  </el-form-item>
 			</el-form>
 		  </div>
@@ -37,28 +37,35 @@
 							 @row-click="yydp_clickybupdate"
                         	 @row-dblclick="yydp_updateCompanyFunc"
 							 highlight-current-row="true"
-							style="width: 100%;height: 65vh" border  :data="tableData1" row-key="ID" >
-						<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
+							style="width: 100%;height: 65vh" border  :data="tableData1" row-key="ID" @selection-change="handleSelectionChange">
+						<el-table-column align="center" type="selection" width="30"/>
 						<el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
-						<el-table-column  sortable align="center" label="颜色名称" prop="颜色名称"  width="120" />
-						<el-table-column  sortable align="center" label="生产款号" prop="生产款号"  width="120" />
-						<el-table-column  sortable align="center" label="客户" prop="客户编号"  width="100" />
-						<el-table-column  sortable align="center" label="船样" prop="船样"  width="90" />
-						<el-table-column  sortable align="center" label="S" prop="S"  width="80" />
-						<el-table-column  sortable align="center" label="M" prop="M"  width="80" />
-						<el-table-column  sortable align="center" label="L" prop="L"  width="80" />
-						<el-table-column  sortable align="center" label="XL" prop="XL"  width="80" />
-						<el-table-column  sortable align="center" label="XXL" prop="XXL"  width="80" />
-						<el-table-column  sortable align="center" label="制单总数" prop="订单数量"  width="120" />
-						<el-table-column  sortable align="center" label="建档用户" prop="建档用户"  width="120" />
-						<el-table-column  sortable align="center" label="建档日期" prop="建档日期"  width="120" />
-						<el-table-column  sortable align="center" label="更新时间" prop="更新时间"  width="120" />
-						<el-table-column  sortable align="center" label="核批人" prop="核批人"  width="100" />
-						<el-table-column  sortable align="center" label="核批日期" prop="核批日期"  width="120" />
+						<el-table-column  sortable align="center" label="客户" prop="客户编号"  width="110" />
+						<!-- <el-table-column  sortable align="center" label="颜色名称" prop="颜色名称"  width="120" /> -->
+						<el-table-column  sortable align="center" label="生产款号" prop="生产款号"  width="220" />
+						<el-table-column  sortable align="center" label="款式" prop="款式"  width="100" />
+						<el-table-column  sortable align="center" label="工单状态" prop="gd_statu"  width="120" />
+						<el-table-column  sortable align="center" label="船样描述" prop="船样描述"  width="200" />
+						<el-table-column  sortable align="center" label="船样合计" prop="船样合计"  width="120" />
+						<el-table-column  sortable align="center" label="要求" prop="要求"  width="120" />
+						<el-table-column  sortable align="center" label="箱唛要求" prop="箱唛要求"  width="120" />
+						<el-table-column  sortable align="center" label="粘衬" prop="粘衬"  width="120" />
+						<el-table-column  sortable align="center" label="订单数量" prop="订单数量"  width="120" />
+						<el-table-column  sortable align="center" label="单位" prop="单位"  width="120" />
+						<el-table-column  sortable align="center" label="工单完工数量" prop="工单完工数量"  width="140" />
+						<el-table-column  sortable align="center" label="工单完工日期" prop="工单完工日期"  width="140" />
+						<el-table-column  sortable align="center" label="建档用户" prop="Sys_id"  width="120" />
+						<el-table-column  sortable align="center" label="建档日期" prop="Sys_rq"  width="120" />
+						<el-table-column  sortable align="center" label="接单日期" prop="接单日期"  width="120" />
+						<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="120" />
+						<el-table-column  sortable align="center" label="落货日期" prop="落货日期"  width="120" />
+						<el-table-column  sortable align="center" label="更新时间" prop="Mod_rq"  width="120" />
+						<el-table-column  sortable align="center" label="审核" prop="审核"  width="100" />
+						<el-table-column  sortable align="center" label="审核日期" prop="审核日期"  width="120" />
 					</el-table>
 				</el-tab-pane>
 
-              <el-tab-pane label="样衣已核批列表"  @click="showTable('样衣已核批列表')" name="second">
+              <!-- <el-tab-pane label="样衣已核批列表"  @click="showTable('样衣已核批列表')" name="second">
 				<el-table ref="multipleTable"  :row-style="{ height: '20px' }"
 							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 							:header-cell-style="{ padding: '0px' }"
@@ -84,7 +91,7 @@
 						<el-table-column  sortable align="center" label="核批人" prop="核批人"  width="100" />
 						<el-table-column  sortable align="center" label="核批日期" prop="核批日期"  width="120" />
 					</el-table>
-              </el-tab-pane>
+              </el-tab-pane> -->
             </el-tabs>
 
   
@@ -123,13 +130,35 @@
   // 全量引入格式化工具 请按需保留
   import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
   import {ref, reactive} from 'vue'
-  import {UnapprovalList} from '@/api/mes/job'
+  import {UnapprovalList,Approval} from '@/api/mes/job'
   
   import {jcgetTab,workOrderDetail,getOrderProcessCount,PrintDetailList} from '@/api/yunyin/yunying'
   import PrintPage from './components/print.vue'
   import {ElMessage} from "element-plus";
   defineOptions({name: 'Company'})
 
+//进入页面显示所有数据
+const getUnapprovalList = async () => {
+  try {
+    const UnapprovalListtable  = await UnapprovalList({search:''});
+	console.log(1484,UnapprovalListtable)
+	const workOrderDetaildata1 = UnapprovalListtable.data
+	tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
+  setTimeout(() => {
+				const inputElement = document.getElementById('searchInput');
+				if (inputElement) {
+					inputElement.focus();		
+				}
+			}, 100); // 延迟100毫秒
+  } catch (error) {
+    console.error(error)
+  }
+}
+getUnapprovalList();
+
+
+
+
   // =========== 获取左侧树侧形结构 ===========
 //   const treeData = ref({})
 //   const _department_code = ref(null)
@@ -243,34 +272,57 @@ const yyyp_clickybupdate = async (row) => {
 const yyyp_updateCompanyFunc = async (row) => {
 
 };
-  
-  
-
-  
+ 
 
 // =========== 按钮 ===========
 // 搜索默认为空
 const searchInfo = ref('')
+const table_Selection = ref(false)
 //点击【查询】按钮
 const onSubmit = async ()  => {
 	if(searchInfo.value === ''){
-    ElMessage({type: 'warning',message: '请输入搜索的信息'})
-    return false;
+		const UnapprovalListtable = await UnapprovalList({search:''});
+		tableData1.splice(0,tableData1.length,...UnapprovalListtable.data);
   }else{
 	const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
-	console.log(124,UnapprovalListtable)
-    console.log(searchInfo.value)
-    console.log("点击了搜索按钮");
-	const workOrderDetaildata1 = UnapprovalListtable.data
-	tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
-	console.log(128,workOrderDetaildata1)
+	tableData1.splice(0,tableData1.length,...UnapprovalListtable.data);
   }
 };
-const hptg_onClick = () => {
 
+//表格复选框
+const _Uniqid = ref('');  
+const _Sys_id = ref('');
+const handleSelectionChange = (selection, type) => {
+    console.log(selection);  
+	if(selection.length >= 1){
+		table_Selection.value = true
+		 // 提取 Uniqid  
+		 const Uniqid_ids = selection.map(item => item.Uniqid).join(',');  
+		_Uniqid.value = Uniqid_ids;  
+		// 提取 Sys_id  
+		const Sys_ids = selection.map(item => item.Sys_id).join(',');  
+		_Sys_id.value = Sys_ids;  
+	}else{
+		table_Selection.value = false
+	}
+   
 };
 
-
+//核批通过按钮
+const hptg_onClick = async () => {
+	console.log(_Uniqid.value)
+	console.log(_Sys_id.value)
+	const Approvals = await Approval({Uniqid:_Uniqid.value,sys_id:_Sys_id.value});
+	if (Approvals.code === 0) {
+		searchInfo.value = ''
+		ElMessage({type: 'success',message: '核批成功'})
+		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
+		const workOrderDetaildata1 = UnapprovalListtable.data
+		tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
+	} else {
+		ElMessage({ type: 'error',message: '核批失败'})
+	}
+};
 
  
 

+ 21 - 32
src/view/yunyin/shengchanguanli/yuedudahuoshengchanjindu.vue

@@ -4,9 +4,9 @@
 		<layout-header>
 		  <div class="">
 			<!--          按钮部分-->
-			<el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+			<el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit()">
 			  <el-form-item>
-				<el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
+				<el-input v-model="searchInfo" placeholder="搜索" style="width: 180px;"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
 				<!-- <el-button type="primary" icon="edit"   @click="gd_gxclhconClick"  class="bt" title="修改">修改</el-button> -->
 			  </el-form-item>
@@ -40,28 +40,18 @@
 						highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 						@row-click="tableRowClick" :show-overflow-tooltip="true"
 						@selection-change="handleSelectionChange">
-						<el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-             			<el-table-column  sortable align="center" label="款式" prop="款式"  width="120" />
-			 			<el-table-column  sortable align="center" label="客户编号" prop="客户编号"  width="100" />
-			 			<el-table-column  sortable align="center" label="下单日期" prop="下单日期"  width="100" />
-			 			<el-table-column  sortable align="center" label="客户确认货期" prop="客户确认货期"  width="130" />
-			 			<el-table-column  sortable align="center" label="款号" prop="款号"  width="80" />
-			 			<el-table-column  sortable align="center" label="生产组别" prop="生产组别"  width="100" />
-			 			<el-table-column  sortable align="center" label="订单数量" prop="订单数量"  width="100" />
-			 			<el-table-column  sortable align="center" label="实裁数量" prop="实裁数量"  width="100" />	
-			 			<el-table-column  sortable align="center" label="已完成数量" prop="已完成数量"  width="120" />
-			 			<el-table-column  sortable align="center" label="入库数量" prop="入库数量"  width="100" />
-			 			<el-table-column  sortable align="center" label="面料入库时间" prop="面料入库时间"  width="130" />
-			 			<el-table-column  sortable align="center" label="辅料入库时间" prop="辅料入库时间"  width="130" />
-			 			<el-table-column  sortable align="center" label="产前样批核" prop="产前样批核"  width="120" />
-			 			<el-table-column  sortable align="center" label="大货制单" prop="大货制单"  width="100" />
-			 			<el-table-column  sortable align="center" label="工装模板" prop="工装模板"  width="100" />
-			 			<el-table-column  sortable align="center" label="开裁日期" prop="开裁日期"  width="100" />
-			 			<el-table-column  sortable align="center" label="上车位时间" prop="上车位时间"  width="120" />
-			 			<el-table-column  sortable align="center" label="台产" prop="台产"  width="80" />
-			 			<el-table-column  sortable align="center" label="车位完成时间" prop="车位完成时间"  width="160" />
-			 			<el-table-column  sortable align="center" label="后道完成时间" prop="后道完成时间"  width="160" />
-			 			<el-table-column  sortable align="center" label="备注" prop="备注"  width="150" />
+						<el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
+						<el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
+						<el-table-column  sortable align="center" label="款号" prop="款号"  width="100" />
+             			<el-table-column  sortable align="center" label="颜色" prop="颜色"  width="120" />
+			 			<el-table-column  sortable align="center" label="车缝" prop="车缝"  width="100" />
+			 			<el-table-column  sortable align="center" label="后道收样" prop="后道收样"  width="100" />
+			 			<el-table-column  sortable align="center" label="大烫" prop="大烫"  width="130" />
+			 			<el-table-column  sortable align="center" label="总检" prop="总检"  width="80" />
+			 			<el-table-column  sortable align="center" label="包装" prop="包装"  width="100" />
+			 			<el-table-column  sortable align="center" label="制单总数" prop="制单总数"  width="100" />
+			 			<el-table-column  sortable align="center" label="裁切总数" prop="裁切数量"  width="100" />	
+			 			<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="160" />
 			  </el-table>
   
 			  <!-- 分页 -->
@@ -105,10 +95,11 @@ const getDepartmentdata = async () => {
 getDepartmentdata();
   
   //点击左侧树形 获取右侧table列表
+  let _ddrq = ref('');
   const tableData = reactive([]);
   const _code = ref(null);  //左侧菜单编号
   const handleNodeClick = async (node) => {
-	console.log(778,node)
+		_ddrq.value = node.label.replace('-', '');
   // 取消所有节点的颜色
   const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
   allNodes.forEach(node => {
@@ -154,15 +145,13 @@ getDepartmentdata();
   
   //获取员工信息列表
   const _workOrderDetailList = async ()=>{
-	const OrderYieldListtable = await OrderYieldList();
+	const OrderYieldListtable = await OrderYieldList({mouth:_ddrq.value});
 	console.log(456,OrderYieldListtable)
-	  try {
-		const workOrderDetaildata = 
-  
-	  console.log(workOrderDetaildata)
-	  tableData.splice(0,tableData.length,...workOrderDetaildata);
+	try {
+		const workOrderDetaildata = OrderYieldListtable
+		tableData.splice(0,tableData.length,...workOrderDetaildata.data);
 	} catch (error) {
-	  console.error(error);
+		console.error(error);
 	}
   }
   

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác