优化1

src/api/mes/job.js

@@ -44,8 +44,23 @@ export const getPieceWork = (data) => {
     data
   })
 }
+// //工单资料左侧客户菜单栏
+// export const Datalist = (params) => {
+//   return service({
+//     url: '/mes_server/work_order/Datalist',
+//     method: 'get',
+//     params
+//   })
+// }
 
-
+//获取报工历史记录
+export const getTab = (params) => {
+  return service({
+    url: '/mes_server/work_order_verification/getTab',
+    method: 'get',
+    params
+  })
+}
 //物理地址获取机台编号
 export const getMachineMac = (params) => {
   return service({
@@ -104,7 +119,7 @@ export const getSpotLocal = (params) => {
   })
 }
 
-// 工单抽检记录修改
+
 export const updateSpotData = (data) => {
   return service({
     url: '/mes_server/work_order_spot_check/edit',
@@ -112,7 +127,7 @@ export const updateSpotData = (data) => {
     data
   })
 }
-// 工单抽检记录新增
+
 export const add = (data) => {
   return service({
     url: '/mes_server/work_order_spot_check/add',
@@ -121,7 +136,7 @@ export const add = (data) => {
   })
 }
 
-// 工单抽检记录获取工单抽检记录信息
+
 export const getSpotInfo = (params) => {
   return service({
     url: '/mes_server/work_order_spot_check/getInfo',
@@ -145,7 +160,7 @@ export const getRewardList = (params) => {
   })
 }
 
-// 获取工序大废品惩奖信息
+
 export const getRewardDetail = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/getInfo',
@@ -154,7 +169,7 @@ export const getRewardDetail = (params) => {
   })
 }
 
-// 大废品奖惩侧边栏根据工单
+
 export const getRewardTabByGd = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/getTabByGd',
@@ -162,7 +177,7 @@ export const getRewardTabByGd = (params) => {
     params
   })
 }
-// 大废品奖惩工单编号获取
+
 export const JunkWorkOrderList = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/JunkWorkOrderList',
@@ -170,7 +185,6 @@ export const JunkWorkOrderList = (params) => {
     params
   })
 }
-// 大废品奖惩印件编号获取
 export const PrintCodeList = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/PrintCodeList',
@@ -178,7 +192,6 @@ export const PrintCodeList = (params) => {
     params
   })
 }
-// 大废品奖惩工单工艺获取
 export const ProcessList = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/ProcessList',
@@ -186,7 +199,6 @@ export const ProcessList = (params) => {
     params
   })
 }
-// 大废品奖惩获取机组员工编号
 export const MachineClassList = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/MachineClassList',
@@ -194,7 +206,6 @@ export const MachineClassList = (params) => {
     params
   })
 }
-// 大废品奖惩机台编号获取
 export const MachineList = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/MachineList',
@@ -202,7 +213,6 @@ export const MachineList = (params) => {
     params
   })
 }
-// 大废品奖惩大废品数据删除
 export const JunkDetailDel = (params) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/JunkDetailDel',
@@ -210,7 +220,6 @@ export const JunkDetailDel = (params) => {
     params
   })
 }
-// 大废品奖惩大废品数据修改
 export const JunkDetailEdit = (data) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/JunkDetailEdit',
@@ -218,7 +227,6 @@ export const JunkDetailEdit = (data) => {
     data
   })
 }
-// 大废品奖惩大废品数据添加
 export const JunkDetailAdd = (data) => {
   return service({
     url: '/mes_server/large_waste_reward_punish/JunkDetailAdd',
@@ -226,7 +234,6 @@ export const JunkDetailAdd = (data) => {
     data
   })
 }
-//1.1获取工单基本数据
 export const getDocumentData = (params) => {
   return service({
     url: '/mes_server/process_document/getData',
@@ -234,7 +241,6 @@ export const getDocumentData = (params) => {
     params
   })
 }
-//1.2获取历史工艺信息
 export const getHistory = (params) => {
   return service({
     url: '/mes_server/process_document/getHistory',

src/api/yunyin/yunying.js

@@ -312,6 +312,8 @@ export const DataList = (params) => {
         params
     })
 }
+
+
 // 美浓产品数据同步
 export const ProductDetailData = (params) => {
     return service({

src/view/performance/baozhuangbaogong.vue

@@ -52,60 +52,13 @@
 					</div>  
 					</el-form-item>  
 				</el-row>  
-					
-				  <!-- <el-row :gutter="24">
-		          <el-form-item label="尺码" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <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;"/>
-		              <el-input v-model="cmformdata.cm4" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm5" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm6" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm7" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm8" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm10" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm11" disabled style="width: 90px;height: 40px;"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="制单数/实裁量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="zdscformdata.zdsc1" disabled style="width: 90px;height: 40px;" id="zdsc1"/>
-		              <el-input v-model="zdscformdata.zdsc2" disabled style="width: 90px;height: 40px;" id="zdsc2"/>
-		              <el-input v-model="zdscformdata.zdsc3" disabled style="width: 90px;height: 40px;" id="zdsc3"/>
-		              <el-input v-model="zdscformdata.zdsc4" disabled style="width: 90px;height: 40px;" id="zdsc4"/>
-		              <el-input v-model="zdscformdata.zdsc5" disabled style="width: 90px;height: 40px;" id="zdsc5"/>
-		              <el-input v-model="zdscformdata.zdsc6" disabled style="width: 90px;height: 40px;" id="zdsc6"/>
-		              <el-input v-model="zdscformdata.zdsc7" disabled style="width: 90px;height: 40px;" id="zdsc7"/>
-		              <el-input v-model="zdscformdata.zdsc8" disabled style="width: 90px;height: 40px;" id="zdsc8"/>
-		              <el-input v-model="zdscformdata.zdsc9" disabled style="width: 90px;height: 40px;" id="zdsc9"/>
-					  <el-input v-model="zdscformdata.zdsc10" disabled style="width: 90px;height: 40px;" id="zdsc10"/>
-					  <el-input v-model="zdscformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zdsc11"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="数量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input  v-model="slformdata.sl1" style="width: 90px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
-		              <el-input  v-model="slformdata.sl2" style="width: 90px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
-		              <el-input  v-model="slformdata.sl3" style="width: 90px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
-		              <el-input  v-model="slformdata.sl4" style="width: 90px;height: 40px;" id="sl4"@keydown="handleKeyDown($event, 'sl3', 'sl4', 'sl5')"/>
-		              <el-input  v-model="slformdata.sl5" style="width: 90px;height: 40px;" id="sl5"@keydown="handleKeyDown($event, 'sl4', 'sl5', 'sl6')"/>
-		              <el-input  v-model="slformdata.sl6" style="width: 90px;height: 40px;" id="sl6"@keydown="handleKeyDown($event, 'sl5', 'sl6', 'sl7')"/>
-		              <el-input  v-model="slformdata.sl7" style="width: 90px;height: 40px;" id="sl7"@keydown="handleKeyDown($event, 'sl6', 'sl7', 'sl8')"/>
-		              <el-input  v-model="slformdata.sl8" style="width: 90px;height: 40px;" id="sl8"@keydown="handleKeyDown($event, 'sl7', 'sl8', 'sl9')"/>
-		              <el-input  v-model="slformdata.sl9" style="width: 90px;height: 40px;" id="sl9"@keydown="handleKeyDown($event, 'sl8', 'sl9', 'sl10')"/>
-					  <el-input  v-model="slformdata.sl10" style="width: 90px;height: 40px;" id="sl10"@keydown="handleKeyDown($event, 'sl9', 'sl10', 'sl1')"/>
-					  <el-input  v-model="slformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
-		          </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: 37vh"
+							 style="width: 100%;height: 53vh"
 							 tooltip-effect="dark"
 							 :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"
 							 :cell-style="{ padding: '10px', fontSize: '20px' }" :header-row-style="{ height: '20px' }"
@@ -186,7 +139,7 @@ export default {
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {hiprint} from "vue-plugin-hiprint";
 import {ref, reactive,nextTick,watch, setBlockTracking } from 'vue'
-import {getSpotList,search,getMachineMac} from '@/api/mes/job'
+import {getSpotList,search,getMachineMac,getTab} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 import { get } from 'scriptjs';
 defineOptions({name: 'Company'})
@@ -207,7 +160,7 @@ const currentDates = `${year}-${month}-${day}`;
   //物理地址获取机台编号
 const getMachineMacdata = async () => {
   try {
-	const Machine = '68-ED-A4-26-60-D1'
+	const Machine = '68-ED-A4-26-5F-38'
     const data  = await getMachineMac({sys_sbID:Machine});
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['工序']
@@ -221,7 +174,7 @@ getMachineMacdata();
 
 
 //点击【查询】按钮DC2408001-1,01,8,10,0
-const add_searchInfo = ref('DC2408001-1,HD01,32,12,0')
+const add_searchInfo = ref('')
 const add_tableData = reactive([]);
 const activeButtonValue = ref('')
 const UniqId = ref('')
@@ -235,7 +188,7 @@ const add_onSubmit = async ()=>{
   }else{
     const order =add_searchInfo.value;
 	const sys_sbID = add_formData['机台号']
-	const getSpotLists = await getSpotList({order:order,code:'后道',sys_sbID:sys_sbID});
+	const getSpotLists = await getSpotList({order:order,code:'包装',sys_sbID:sys_sbID});
 	activeButtonValue.value = getSpotLists.data.result.wb
     UniqId.value = getSpotLists.data.result.UniqId
 	add_formData['数量'] = getSpotLists.data.result.sl
@@ -278,10 +231,20 @@ const add_Dialog = async ()=>{
 			if (add_formData.数量 && add_formData.数量 !== '') {  
 				// 假设search函数可以处理一个包含多个参数的数组  
 				// 注意：如果search函数不支持数组，并且需要单独调用每个params，您可能需要使用Promise.all  
-				const cf_gettab = await search({UniqId:UniqId._value,code:'后道'}); // 调用search函数  
+				const cf_gettab = await search({UniqId:UniqId._value,code:'包装'}); // 调用search函数  
 				if (cf_gettab.code === 0) {  
-					ElMessage({type: 'success', message: '报工成功'});  
+					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: '报工失败'});  
 				}  

src/view/performance/caiqiebaogong.vue

@@ -65,7 +65,7 @@
 		      </el-row>
 
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-table ref="multipleTable" style="width: 100%;height: 43vh" tooltip-effect="dark"
+					<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' }"
                       :data="add_tableData"  border row-key="ID"
@@ -87,9 +87,9 @@
               <el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
             </el-table>
 			</el-row>
-				<div class="dialog-footer" style="text-align: right;margin-right: 60px;">
-					<el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
-				</div>
+      <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>
   
 			  <!-- 是否订单尾包确认弹窗 -->