包装工序完成，机器检验

src/api/jixiaoguanli/jitairibaobiao.js

@@ -117,4 +117,36 @@ export const edit = (params) => {
 }
 
 
+export const del = (params) => {
+  return service({
+    url:'/mes_server/packaging_process_output/del',
+    method: 'post',
+    params
+  })
+}
+
+
+export const machineLocate = (params) => {
+  return service({
+    url:'/mes_server/inspect/machineLocate',
+    method: 'get',
+    params
+  })
+}
 
+export const MachineInfo = (params) => {
+  return service({
+    url:'/mes_server/inspect/getMachineInfo',
+    method: 'get',
+    params
+  })
+}
+
+
+export const getYg = (params) => {
+  return service({
+    url:'/mes_server/packaging_count_document/getYg',
+    method: 'get',
+    params
+  })
+}

src/view/performance/MachineDocuments.vue

@@ -16,7 +16,7 @@
           <div class="gva-table-box">
             <div class="gva-btn-list">
               <el-row :span="6">
-                <el-input v-model="searchInfo" placeholder="输入工单编号或产品名称" />
+                <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary" :icon="Refresh">重置</el-button>
@@ -53,7 +53,8 @@
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="limit"
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" v-model:current-page="page"
+                v-model:page-size="limit"
                 :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
                 @size-change="handleSizeChange" />
             </div>
@@ -67,14 +68,14 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="日期" prop="id">
-                    <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="2023.12.14" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="组别" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
                       </el-col>                      
                     </el-row>
                   </el-form-item>
@@ -86,17 +87,17 @@
                   <el-row :gutter="20">
                     <el-col :span="5">
                       <el-form-item label="工单编号" prop="id">
-                        <el-input v-model="formData.address" :clearable="true" placeholder="0.00" />
+                        <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="0.00" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="5">                      
-                        <el-input v-model="formData.address" :clearable="true" placeholder="是" />
+                        <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="是" />
                     </el-col>
 					<el-col :span="5">
-					    <el-input v-model="formData.address" :clearable="true" placeholder="是" />
+					    <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="是" />
 					</el-col>
 					<el-col :span="5">
-					    <el-input v-model="formData.address" :clearable="true" placeholder="是" />
+					    <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="是" />
 					</el-col>
                   </el-row>
                 </el-col>
@@ -105,26 +106,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="机台编号" prop="id">
-			         <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_jtbh" :clearable="true" placeholder="2023.12.14" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="检验类型" prop="id">
-			             <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_单据类型" :clearable="true" placeholder="ZT01733" />
 						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="检验类别" prop="name">
-			         <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="A班" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="废品率系数" prop="name">
-				     <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+				     <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="A班" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -133,17 +134,17 @@
              <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="计件箱数" prop="id">
-                    <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="2023.12.14" />
                   </el-form-item>
                 </el-col>
 				 <el-col :span="3">
                   <el-form-item label="每箱数量" prop="name">
-                    <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+                    <el-input v-model="formData.sczl_PgCl" :clearable="true" placeholder="A班" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="3">
                   <el-form-item label="定额代号" prop="name">
-                    <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+                    <el-input v-model="formData.sczl_dedh" :clearable="true" placeholder="A班" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -155,35 +156,39 @@
 			         <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
 			       </el-form-item>
 			     </el-col>
+							 <el-col :span="1">
+							   <el-input v-model="formData.流程单号1" :clearable="true" placeholder="ZT01733" />
+							 </el-col>
+				            <el-col :span="1">
+				              <el-input v-model="formData.流程单号2" :clearable="true" placeholder="ZT01733" />
+				            </el-col>
 			  				  <el-col :span="1">			  			
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
-			  				  </el-col>
-			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
+							  
 			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
 			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
 			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
 			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
 			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			  				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
-			  				  <el-col :span="1">
-			  				    <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+							  <el-col :span="1">
+			  				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="ZT01733" />
 			  				  </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="备注" prop="id">
-			             <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZT01733" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
@@ -194,26 +199,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="换模补产工时" prop="id">
-			         <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="2023.12.14" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						<el-form-item label="设备保养工时" prop="id">
-			             <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="ZT01733" />
 			  						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="异常停机" prop="name">
-			         <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="A班" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="设备通电工时" prop="name">
-					 <el-input v-model="formData.image" :clearable="true" placeholder="A班" />
+					 <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="A班" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -221,102 +226,160 @@
 			  
 					
              
-             <el-row :gutter="10" style="margin-top: 10px;">
+             <!-- <el-row :gutter="10" style="margin-top: 10px;">
 				 <el-col :span="2">
 				   <span>组员信息</span>
 				 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                  <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZI00401" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                  <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="瞿春生" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                  <el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="11.0" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                  <el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="打包废纸" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                  <el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="是" />
                 </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="ZI00401" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_bh7" :clearable="true" placeholder="瞿春生" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_bh8" :clearable="true" placeholder="11.0" />
 				</el-col>
               </el-row>
-            </el-form>
+            </el-form> -->
 			
-			<el-row :gutter="10" style="margin-top: 10px;">
+			<!-- <el-row :gutter="10" style="margin-top: 10px;">
 				 <el-col :span="2">
 				  
 				 </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+			     <el-input v-model="formData.sczl_bh1_name" :clearable="true" placeholder="ZI00401" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+			     <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="瞿春生" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+			     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="11.0" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+			     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="打包废纸" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+			     <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="是" />
 			   </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="ZI00401" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="瞿春生" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="11.0" />
 				</el-col>
 
-			 </el-row>
+			 </el-row> -->
 			 
-			 <el-row :gutter="10" style="margin-top: 10px;">
+	<!-- 		<el-row :gutter="10" style="margin-top: 10px;">
 				 <el-col :span="2">
 				   
 				 </el-col>
 			    <el-col :span="2">
-			      <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+			      <el-input v-model="formData.流程单号1" :clearable="true" placeholder="ZI00401" />
 			    </el-col>
 			    <el-col :span="2">
-			      <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+			      <el-input v-model="formData.流程单号1" :clearable="true" placeholder="瞿春生" />
 			    </el-col>
 			    <el-col :span="2">
-			      <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+			      <el-input v-model="formData.流程单号1" :clearable="true" placeholder="11.0" />
 			    </el-col>
 			    <el-col :span="2">
-			      <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+			      <el-input v-model="formData.流程单号1" :clearable="true" placeholder="打包废纸" />
 			    </el-col>
 			    <el-col :span="2">
-			      <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+			      <el-input v-model="formData.流程单号1" :clearable="true" placeholder="是" />
 			    </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.流程单号1" :clearable="true" placeholder="ZI00401" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.流程单号1" :clearable="true" placeholder="瞿春生" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.流程单号1" :clearable="true" placeholder="11.0" />
 				</el-col>
-			  </el-row>
-            
+			  </el-row> -->
+			  
+			  
+			  <el-table
+			    :data="detailData.table"
+			    border
+			    tooltip-effect="dark"
+			    :row-style="{ height: '20px' }"
+			    :cell-style="{ padding: '0px' }"
+			    :header-row-style="{ height: '20px' }"
+			    :header-cell-style="{ padding: '0px' }"
+			  >
+			  <el-form-item label="11111" prop="name">
+			  	<el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="A班" />
+			  </el-form-item>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+			    <el-table-column label="组员信息">
+			      <template #default="{ row }">
+			        <el-input v-model="row.Gd_cpmc" />
+			      </template>
+			    </el-table-column>
+				<el-table-column label="组员信息">
+				  <template #default="{ row }">
+				    <el-input v-model="row.Gd_cpmc" />
+				  </template>
+				</el-table-column>
+			  </el-table>
+			  
+			  
+			  
+            </el-form> 
 			<el-row :gutter="20">
 			   <el-col :span="20">
 			     <el-form-item label="其他备注" prop="id">
-			       <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+			       <el-input v-model="formData.流程单号" :clearable="true" placeholder="2023.12.14" />
 			     </el-form-item>
 			   </el-col>
 			 </el-row>
@@ -339,7 +402,10 @@
 <script setup>
 import {
   getMachineCount,
-  getDateMachine
+  getDateMachine,
+  machineLocate,
+  MachineInfo,
+  getYg
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -379,18 +445,50 @@ getTabdata();
 
 // 自动化生成的字典（可能为空）以及字段
 const formData = ref({
-  id: '',
-  name: '',
-  date: '',
-  group: '',
-  packingOutput: '',
-  reworkOutput: '',
-  pieceOutput: '',
-  order: '',
-  user: '',
-  createTime: '',
-  updateTime: '',
-  uniqid: '',
+		  sczl_gdbh: '',
+          sczl_yjgx: '',
+          sczl_gxmc: '',
+          sczl_jtbh: '',
+          sczl_bzdh: '',
+          sczl_rq: '',
+          sczl_cl: '',
+          sczl_PgCl: '',
+          sczl_单据类型: '',
+          sczl_dedh: '',
+          sczl_装版工时: '',
+          sczl_保养工时: '',
+          sczl_异常停机工时: '',
+          sczl_设备运行工时: '',
+          sczl_废品率系数: '',
+          sczl_检验类别: '',
+          sczl_bh1: '',
+          sczl_bh2: '',
+          sczl_bh3: '',
+          sczl_bh4: '',
+          sczl_bh5: '',
+          sczl_bh6: '',
+          sczl_bh7: '',
+          sczl_bh8: '',
+          流程单号 :'',
+          流程单号2: '',
+          流程单号3: '',
+          流程单号4: '',
+          流程单号5: '',
+          流程单号6: '',
+          流程单号7: '',
+          流程单号8: '',
+          流程单号9:'',
+          qczl_NumDesc:'',
+          sczl_desc:'',                                           
+          sczl_bh1_name:'',
+          sczl_bh2_name:'',
+          sczl_bh3_name: '',
+          sczl_bh4_name: '',
+          sczl_bh5_name: '',
+          sczl_bh6_name: '',
+          sczl_bh7_name: '',
+          sczl_bh8_name: '',
+          yj_yjmc: ''
 })
 
 // 验证规则
@@ -529,38 +627,97 @@ const page = ref(1)
 const limit = ref(10)
 const searchInfo = ref('')
 const params = {
+  type: '',
   date: '',
   sys_id: '',
-  page: page.value.toString(),
-  limit: limit.value.toString(),
+  gdbh: '',
 }
 
 // 分页设置
 const handleSizeChange = (val) => {
-  limit.value = val;
-  params.limit = val.toString();
-  getTableData();
+  switch (params.type) {
+    case 'getTableData':
+      getTableData()
+      break
+    case 'getLocateTable':
+      GetmachineLocate()
+      break
+    default:
+      break
+  }
 }
 
 // 页面跳转
 const handleCurrentChange = (val) => {
-  page.value = val
-  params.page = val.toString();
-  getTableData()
+ switch (params.type) {
+   case 'getTableData':
+     getTableData()
+     break
+   case 'getLocateTable':
+     GetmachineLocate()
+     break
+   default:
+     break
+ }
 }
 
 const getTableData = async() => {
-  const response = await getDateMachine(params);
-  console.log(response)
+	
+	
+	const response = await getDateMachine({
+	  date: params.date, sys_id: params.sys_id,
+	  page: page.value.toString(), limit: limit.value.toString(),
+	})
+	if (response.code === 0) {
+	  const processedData = response.data.data.map(item => {
+	    return {
+	      ...item,
+	      combinedProp: item.sczl_gdbh + '--'+item.yj_yjmc,
+	      combinedProp2: item.sczl_yjgx + '-'+item.sczl_gxmc
+	    };
+	  });
+	  tableData.splice(0, tableData.length, ...processedData);
+	}
+	
+  // const response = await getDateMachine(params);
+  // console.log(response)
+  // if (response.code === 0) {
+  //   const processedData = response.data.data.map(item => {
+  //     return {
+  //       ...item,
+  //       combinedProp: item.sczl_gdbh + '--'+item.yj_yjmc,
+  //       combinedProp2: item.sczl_yjgx + '-'+item.sczl_gxmc
+  //     };
+  //   });
+  //   tableData.splice(0, tableData.length, ...processedData);
+  // }
+}
+
+
+const GetmachineLocate = async () => {
+  const response = await machineLocate({
+    gdbh: params.gdbh,
+    page: page.value.toString(), limit: limit.value.toString(),
+  })
   if (response.code === 0) {
-    const processedData = response.data.data.map(item => {
-      return {
-        ...item,
-        combinedProp: item.sczl_gdbh + '--'+item.yj_yjmc,
-        combinedProp2: item.sczl_yjgx + '-'+item.sczl_gxmc
-      };
-    });
-    tableData.splice(0, tableData.length, ...processedData);
+    total.value = response.data.total
+    tableData.splice(0, tableData.length, ...response.data.rows)
+  }
+  
+  // const response = await machineLocate(locatevalue);
+  // console.log(locatevalue)
+  // console.log(response)
+  // if (response.code === 0) {
+  //   tableData.splice(0, tableData.length, ...response.data.rows);
+  // }
+}
+
+
+const GetMachineInfo = async (value) => {
+  const response = await MachineInfo({UniqId:value});
+  console.log(response) 
+  if (response.code === 0) {
+	formData.value=response.data;
   }
 }
 
@@ -571,13 +728,25 @@ const handleNodeClick = (node,check) => {
     params.date = node.params.date;
     params.sys_id = node.params.sys_id;
     total.value = node.params.total;
+	   params.type = 'getTableData'
+	    page.value = 1
     getTableData();
   }
 }
 
+const locatevalue={
+	gdbh:'',
+	cpmc:'',
+	page:'5',
+	limit:'10',  
+}
+let positionvalue=ref()
 // 搜索
 function onSearch() {
-	
+	params.gdbh = positionvalue.value
+	params.type = 'getLocateTable'
+	page.value = 1
+	GetmachineLocate()
 }
 // ============== 表格控制部分结束 ===============
 
@@ -683,13 +852,16 @@ const enterDialog = async () => {
     }
   })
 }
-
+let table=ref(5);
+let lastCellValue=ref()
 // 双击表格操作
-function doubleClick(row, column, event) {
-  console.log(row, column, event);
-  // updateCompanyFunc(row);
-  type.value = 'update';
-  dialogFormVisible.value = true
+function doubleClick(row) {
+		  type.value = 'update';
+		  dialogFormVisible.value = true
+		  lastCellValue= row['UniqId'];
+  		 console.log(lastCellValue)
+  	 table.value=lastCellValue
+  GetMachineInfo(table.value)
 }
 
 // 导出excel

src/view/performance/Packagingoutput.vue

@@ -16,12 +16,13 @@
           <div class="gva-table-box">
             <div class="gva-btn-list">
               <el-row :span="6">
-                <el-input v-model="searchInfo" placeholder="输入工单编号或产品名称" />
+                <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary" :icon="Refresh">重置</el-button>
 			  <el-button type="primary" :icon="Search" @click="positioningVisible">定位</el-button>
 			  <el-button type="primary" :icon="Search">查改</el-button>
+			  <el-button type="primary" :icon="Delete" @click="Del">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
               </div>
@@ -31,17 +32,27 @@
               highlight-current-row="true"  :cell-style="cellStyle" border @selection-change="handleSelectionChange" 
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
+<!-- 			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
               <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
               <el-table-column align="left" label="包装产量" prop="sczl_cl" width="120"/>
               <el-table-column align="left" label="包装数量" prop="sczl_PgCl" width="120"/>
               <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
               <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>
+              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/> -->
+			 <!-- 循环渲染列 -->
+				<el-table-column
+				  v-for=" column in tableColumns "
+				  :key="column.prop"
+				  :prop="column.prop"
+				  :label="column.label"
+				  :width="column.width"
+				  show-overflow-tooltip="true"
+				/>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="limit"
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" v-model:current-page="page"
+                v-model:page-size="limit"
                 :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
                 @size-change="handleSizeChange" />
             </div>
@@ -58,15 +69,82 @@
                   <el-form-item label="日期" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="sczl_rqValue" :clearable="true" placeholder="ZT01733" />
                       </el-col>
                     </el-row>
                   </el-form-item>
                 </el-col>
               </el-row>
 
+
+								<el-table
+                               :data="detailData.table"
+                               border
+                               tooltip-effect="dark"
+                               :row-style="{ height: '20px' }"
+                               :cell-style="{ padding: '0px' }"
+                               :header-row-style="{ height: '20px' }"
+                               :header-cell-style="{ padding: '0px' }"
+                             >
+                               <el-table-column
+                                 label="工单编号"
+                                 width="100"
+                               >
+                                 <template #default="{ row, $index }">
+                                   <el-input
+                                     v-model="row.sczl_gdbh"
+                                     @keyup.enter="handleEnter($index, row)"
+                                   />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column
+                                 label="印件工序"
+                                 width="100"
+                               >
+                                 <template #default="{ row }">
+                                   <el-input v-model="row.sczl_yjGx" />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column
+                                 label="工序名称"
+                                 width="100"
+                               >
+                                 <template #default="{ row }">
+                                   <el-input v-model="row.sczl_gxmc" />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column label="印件名称">
+                                 <template #default="{ row }">
+                                   <el-input v-model="row.Gd_cpmc" />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column
+                                 label="包装产量"
+                                 width="100"
+                               >
+                                 <template #default="{ row }">
+                                   <el-input v-model="row.sczl_cl" />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column
+                                 label="每箱数量"
+                                 width="100"
+                               >
+                                 <template #default="{ row }">
+                                   <el-input v-model="row.sczl_PgCl" />
+                                 </template>
+                               </el-table-column>
+                               <el-table-column
+                                 label="零头"
+                                 width="100"
+                               >
+							   <template #default="{ row }">
+							     <el-input v-model="row.sczl_clAdd" />
+							   </template>
+                               </el-table-column>
+                             </el-table>
                             <!-- 标题栏 -->
-                            <el-row :gutter="10">
+                            <!-- <el-row :gutter="10">
                               <el-col :span="3">
                                 <span>工单编号</span>
                               </el-col>
@@ -88,10 +166,10 @@
 							  <el-col :span="2">
 							    <span>零头</span>
 							  </el-col>
-                            </el-row>
+                            </el-row> -->
               
                             <!-- 员工1 -->
-                            <el-row :gutter="5" style="margin-top: 10px;">
+                            <!-- <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh1" :clearable="true" @keyup.enter.native="getGxMcsubmit($event, '1')" placeholder="ZI00401" />
                               </el-col>
@@ -113,10 +191,10 @@
 							  <el-col :span="2">
 							    <el-input v-model="formData.sczl_clAdd1" :clearable="true" placeholder="是" />
 							  </el-col>
-                            </el-row>
+                            </el-row> -->
               
                             <!-- 员工2 -->
-                            <el-row :gutter="5" style="margin-top: 10px;">
+  <!--                          <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh2" :clearable="true" @keyup.enter.native="getGxMcsubmit($event, '2')" placeholder="ZI00401" />
                               </el-col>
@@ -138,10 +216,10 @@
 							  <el-col :span="2">
 							    <el-input v-model="formData.sczl_clAdd2" :clearable="true" placeholder="是" />
 							  </el-col>
-                            </el-row>
+                            </el-row> -->
               
                             <!-- 员工3 -->
-                            <el-row :gutter="5" style="margin-top: 10px;">
+                            <!-- <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh3" :clearable="true" @keyup.enter.native="getGxMcsubmit($event, '3')" placeholder="ZI00401" />
                               </el-col>
@@ -163,10 +241,10 @@
                               <el-col :span="2">
                                 <el-input v-model="formData.sczl_clAdd3" :clearable="true" placeholder="是" />
                               </el-col>
-                            </el-row>
+                            </el-row> -->
               
                             <!-- 员工4 -->
-                           <el-row :gutter="5" style="margin-top: 10px;">
+                           <!-- <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh4" :clearable="true" @keyup.enter.native="getGxMcsubmit($event, '4')" placeholder="ZI00401" />
                               </el-col>
@@ -189,9 +267,9 @@
 							    <el-input v-model="formData.sczl_clAdd4" :clearable="true" placeholder="是" />
 							  </el-col>
                             </el-row>
-              
+              -->
                             <!-- 员工5 -->
-                            <el-row :gutter="5" style="margin-top: 10px;">
+                           <!-- <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh5"  @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="ZI00401" />
                               </el-col>
@@ -213,10 +291,10 @@
                               <el-col :span="2">
                                 <el-input v-model="formData.sczl_clAdd5" :clearable="true" placeholder="是" />
                               </el-col>
-                            </el-row>
+                            </el-row> -->
               
                             <!-- 员工6 -->
-                            <el-row :gutter="5" style="margin-top: 10px;">
+                           <!-- <el-row :gutter="5" style="margin-top: 10px;">
                               <el-col :span="3">
                                 <el-input v-model="formData.sczl_gdbh6" :clearable="true"  @keyup.enter.native="getGxMcsubmit($event, '6')" placeholder="ZI00401" />
                               </el-col>
@@ -238,7 +316,7 @@
                               <el-col :span="2">
                                 <el-input v-model="formData.sczl_clAdd6" :clearable="true" placeholder="是" />
                               </el-col>
-                            </el-row>
+                            </el-row> -->
 			  
             </el-form>
             <!-- </el-scrollbar> -->
@@ -268,21 +346,31 @@
 
           <el-dialog v-model="getGxMcshow" :before-close="closegetGxMcshow" :title="type==='create'?'添加':'修改'" destroy-on-close>
                 
-					<el-form :model="form" label-width="80px">
-					  <div style="display: flex; justify-content: center;">
-					    <el-form-item label="关键字">
-					      <el-input v-model="name"></el-input>
-					    </el-form-item>
-					  </div>
-					</el-form>
-
-			<el-table ref="GxMctable" style="width: 100%" tooltip-effect="dark" :data="GxMctableData" row-key="ID"
-			  highlight-current-row="true"  :cell-style="cellStyle" border @selection-change="handleSelectionChange"
-			   :show-overflow-tooltip="true" @row-dblclick="GxMcdoubleClick">			   
-			  <el-table-column align="left" label="印件工序" prop="jyGx" width="120" />
-			  <el-table-column align="left" label="工序名称" prop="Gy0_gxmc" width="120"/>
-			  <el-table-column align="left" label="印件名称" prop="Gd_cpmc" width="800"/>
-			</el-table>
+					<el-table
+					              tooltip-effect="dark"
+					              :data="selectData"
+					              row-key="ID"
+					              highlight-current-row="true"
+					              border
+					              style="width:100%"
+					              @row-dblclick="handleSelectClick"
+					            >
+					              <el-table-column
+					                prop="Gd_cpmc"
+					                label="产品名称"
+					                width="300"
+					              />
+					              <el-table-column
+					                prop="Gy0_gxmc"
+					                label="产品名称"
+					                width="100"
+					              />
+					              <el-table-column
+					                prop="jyGx"
+					                label="产品名称"
+					                width="100"
+					              />
+					            </el-table>
 		
 			<template #footer>
 			  <div class="dialog-footer">
@@ -305,7 +393,8 @@ import {
   locate,
   getInfo,
   getGxMc,
-  edit
+  edit,
+  del
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -391,44 +480,44 @@ const formData = ref({
 
 
 const formData2 = ref({
-	      UniqId:'000',
-		  sczl_rq: '',
-          sczl_gdbh1: '',
-          sczl_gdbh2: '',
-          sczl_gdbh3: '',
-          sczl_gdbh4: '',
-          sczl_gdbh5: '',
-          sczl_gdbh6: '',
-          sczl_yjGx1: '',
-          sczl_yjGx2: '',
-          sczl_yjGx3: '',
-          sczl_yjGx4: '',
-          sczl_yjGx5: '',
-          sczl_yjGx6: '',
-		  sczl_gxmc1: '',
-		  sczl_gxmc2: '',
-		  sczl_gxmc3: '',
-		  sczl_gxmc4: '',
-		  sczl_gxmc5: '',
-		  sczl_gxmc6: '',
-          sczl_cl1: '',
-          sczl_cl2: '',
-          sczl_cl3: '',
-          sczl_cl4: '',
-          sczl_cl5: '',
-          sczl_cl6: '',
-          sczl_PgCl1:'',
-          sczl_PgCl2: '',
-          sczl_PgCl3: '',
-          sczl_PgCl4: '',
-          sczl_PgCl5: '',
-          sczl_PgCl6: '',
-		  sczl_clAdd1: '',
-		  sczl_clAdd2: '',
-		  sczl_clAdd3: '',
-		  sczl_clAdd4: '',
-		  sczl_clAdd5:'',
-		  sczl_clAdd6: '',  
+	      UniqId:'0',
+		  sczl_rq: '2025-01-01 00:00:00',
+          sczl_gdbh1: '2311232',
+          sczl_gdbh2: '2311232',
+          sczl_gdbh3: '2311232',
+          sczl_gdbh4: '2311232',
+          sczl_gdbh5: '2311232',
+          sczl_gdbh6: '2311232',
+          sczl_yjGx1: '01-71',
+          sczl_yjGx2: '01-71',
+          sczl_yjGx3: '01-71',
+          sczl_yjGx4: '01-71',
+          sczl_yjGx5: '01-71',
+          sczl_yjGx6: '01-71',
+		  sczl_gxmc1: '包装',
+		  sczl_gxmc2: '包装',
+		  sczl_gxmc3: '包装',
+		  sczl_gxmc4: '包装',
+		  sczl_gxmc5: '包装',
+		  sczl_gxmc6: '包装',
+          sczl_cl1: '6.00',
+          sczl_cl2: '6.00',
+          sczl_cl3: '6.00',
+          sczl_cl4: '6.00',
+          sczl_cl5: '6.00',
+          sczl_cl6: '6.00',
+          sczl_PgCl1:'500',
+          sczl_PgCl2: '500',
+          sczl_PgCl3: '500',
+          sczl_PgCl4: '500',
+          sczl_PgCl5: '500',
+          sczl_PgCl6: '500',
+		  sczl_clAdd1: '500',
+		  sczl_clAdd2: '500',
+		  sczl_clAdd3: '500',
+		  sczl_clAdd4: '500',
+		  sczl_clAdd5:'500',
+		  sczl_clAdd6: '500',  
 })
 
 // 验证规则
@@ -442,138 +531,27 @@ const elSearchFormRef = ref()
 const tableData = reactive([])
 const GxMctableData = reactive([])
 
-const detailData = reactive([
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-  {
-    gdbh: '2311736',
-    yjgx: '01-15',
-    gxmc: '包装(圆切)',
-    yjmc: '利群(新)小《降焦改版)',
-    bzcl: '13.00',
-    fgcl: '0.00',
-    mxsl: '2500',
-    jcxs: '1.000',
-    ly: '',
-    dedh: '030002002',
-  },
-])
+const tableColumns = [
+  { label: '创建用户', prop: 'sys_id', width: '240' },
+  { label: '日期', prop: 'sczl_rq', width: '100' },
+  { label: '包装产量', prop: 'sczl_cl', width: '100' },
+  { label: '包装数量', prop: 'sczl_PgCl', width: '100' },
+  { label: '创建时间', prop: 'sys_rq', width: '180' },
+  { label: '修改时间', prop: 'mod_rq', width: '180' },
+  { label: 'UNIQID', prop: 'UniqId', width: '100' },
+]
+
+const detailData = reactive([])
 const total=ref(0)
 const inputname=ref(0)
 const page = ref(1)
 const limit = ref(10)
 const searchInfo = ref('')
 const params = {
+  type: '',
   date: '',
   sys_id: '',
-  page: page.value.toString(),
-  limit: limit.value.toString(),  
+  gdbh: '',
 }
 const locatevalue={
 	gdbh:'',
@@ -587,18 +565,32 @@ let GxMcvalue=ref()
 
 // 分页设置
 const handleSizeChange = (val) => {
-  limit.value = val;
-  params.limit = val.toString();
-  getTableData();
+ switch (params.type) {
+   case 'getTableData':
+     getTableData()
+     break
+   case 'getLocateTable':
+     GetmachineLocate()
+     break
+   default:
+     break
+ }
 }
 
 
 
 // 页面跳转
 const handleCurrentChange = (val) => {
-  page.value = val
-  params.page = val.toString();
-  getTableData()
+ switch (params.type) {
+   case 'getTableData':
+     getTableData()
+     break
+   case 'getLocateTable':
+     GetmachineLocate()
+     break
+   default:
+     break
+ }
 }
 
 // 查询
@@ -622,11 +614,19 @@ const handleNodeClick = (node, check) => {
 }
 const Getlocate = async () => {
   
-  const response = await locate(locatevalue);
-  console.log(locatevalue)
-  console.log(response)
+  // const response = await locate(locatevalue);
+  // console.log(locatevalue)
+  // console.log(response)
+  // if (response.code === 0) {
+  //   tableData.splice(0, tableData.length, ...response.data.rows);
+  // }
+  const response = await locate({
+    gdbh: params.gdbh,
+    page: page.value.toString(), limit: limit.value.toString(),
+  })
   if (response.code === 0) {
-    tableData.splice(0, tableData.length, ...response.data.rows);
+    total.value = response.data.total
+    tableData.splice(0, tableData.length, ...response.data.rows)
   }
 }
 
@@ -639,20 +639,66 @@ const enterpositioning = async () => {
 }
 
 
-
+// 处理回车
+const handleEnter = (index, row) => {
+  GetGxMc(index, row)
+}
+let sczl_rqValue=ref()
 const getpickInfo = async (value) => {
+	
   const response = await getInfo({UniqId:value});
-  console.log(response) 
-  if (response.code === 0) {
-	formData.value=response.data;
-	formData2.value=response.data;
-	console.log(formData2)
+ if (response.code === 0) {
+    const { sczl_rq,...rest } = response.data
+    // 直接赋值基础属性
+	sczl_rqValue.value=response.data.sczl_rq
+	console.log(response.data.sczl_rq)
+    Object.assign(detailData, { sczl_rq,})
+    // 生成表格数据
+    detailData.table = Array.from({ length: 6 }, (_, i) => i + 1) // 创建一个长度为6的数组 [1, 2, 3, 4, 5, 6]
+      .map(num => {
+        return {
+          sczl_gdbh: rest[`sczl_gdbh${num}`],
+          sczl_yjGx: rest[`sczl_yjGx${num}`],
+          sczl_gxmc: rest[`sczl_gxmc${num}`],
+          Gd_cpmc: rest[`Gd_cpmc${num}`],
+          sczl_cl: rest[`sczl_cl${num}`],
+          sczl_PgCl: rest[`sczl_PgCl${num}`],
+          sczl_clAdd: rest[`sczl_clAdd${num}`],
+        }
+      })
+      // .filter(item => item.sczl_gdbh !== '') // 过滤掉空的工单编号
+    dialogFormVisible.value = true
   }
 }
 
-
+// 更新数据
+const updateDetailData = async() => {
+  const restoredData = {
+    UniqId: lastCellValue,
+    sczl_rq: detailData.sczl_rq,
+    sczl_gdbh: detailData.sczl_gdbh,
+    sczl_yjGx: detailData.sczl_yjGx,
+    sczl_gxmc: detailData.sczl_gxmc,
+    sczl_cl: detailData.sczl_cl,
+    sczl_PgCl: detailData.sczl_PgCl,
+    sczl_clAdd: detailData.sczl_clAdd,
+  }
+  detailData.table.forEach((item, index, array) => {
+    const num = index + 1
+    restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
+    restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
+    restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
+    // restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
+    restoredData[`sczl_cl${num}`] = item.sczl_cl
+    restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
+    restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
+  })
+   // restoredData.UniqId = 1
+   // const res = await edit(restoredData)
+  console.log(restoredData)
+  console.log(res)
+}
 const GxMcedit = async () => {
-  
   console.log(formData2)
   const response = await edit(formData2);
   if (response.code === 0) {
@@ -660,61 +706,88 @@ const GxMcedit = async () => {
   }
 }
 
-
-const GetGxMc = async (value, num) => {
-  const response = await getGxMc({gdbh: value});
-  console.log(response);
+const GxMcdel = async () => {
+  const response = await del({UniqId:lastCellValue});
   if (response.code === 0) {
-    if (response.data.length > 1) {
-		
-		
-	GxMctableData.splice(0, GxMctableData.length, ...response.data);
-    getGxMcshow.value = true; 
-    }
+	console.log(333)
+  }
+  getTableData()
+}
+
+
+const selectData = reactive([
+  {
+    Gd_cpmc: '黄金叶（乐途硬）小盒（二维码改版）',
+    Gy0_gxmc: '包装',
+    jyGx: '01-71',
+  },
+])
+let tableIndex = 0
+// 处理选择框
+const handleSelectClick = (row, column, event) => {
+  const { Gd_cpmc, Gy0_gxmc, jyGx } = row
+  detailData.table[tableIndex].Gd_cpmc = Gd_cpmc
+  detailData.table[tableIndex].sczl_yjGx = jyGx
+  detailData.table[tableIndex].sczl_gxmc = Gy0_gxmc
+  getGxMcshow.value = false
+}
+const GetGxMc = async (index, row) => {
+	
+	
+	
+	
+	console.log(row)
+	  const response = await getGxMc({gdbh: row.sczl_gdbh })
+	  if (response.code === 0) {
+	    const { Gd_cpmc, Gy0_gxmc, jyGx } = response.data[0]
+	    if (response.data.length === 1) {
+	      detailData.table[index].Gd_cpmc = Gd_cpmc
+	      detailData.table[index].sczl_yjGx = jyGx
+	      detailData.table[index].sczl_gxmc = Gy0_gxmc
+	    } else {
+	      selectData.splice(0, selectData.length, ...response.data)
+	      tableIndex = index
+	      getGxMcshow.value = true
+	    }
+	  }
+	
+ //  const response = await getGxMc({gdbh: value});
+ //  console.log(response);
+ //  if (response.code === 0) {
+ //    if (response.data.length > 1) {		
+	// GxMctableData.splice(0, GxMctableData.length, ...response.data);
+ //    getGxMcshow.value = true; 
+ //    }
     
-    // 取出 data 中的第一个元素
-    const item = response.data[0];
+ //    // 取出 data 中的第一个元素
+ //    const item = response.data[0];
     
-    // 将数据拆分成变量名和内容
-    const variableName = Object.keys(item)[0]; // 变量名
-    const variableContent = item[variableName]; // 变量内容
+ //    // 将数据拆分成变量名和内容
+ //    const variableName = Object.keys(item)[0]; // 变量名
+ //    const variableContent = item[variableName]; // 变量内容
     
-    const variableName1 = Object.keys(item)[1]; // 变量名
-    const variableContent1 = item[variableName1]; // 变量内容
+ //    const variableName1 = Object.keys(item)[1]; // 变量名
+ //    const variableContent1 = item[variableName1]; // 变量内容
     
-    const variableName2 = Object.keys(item)[2]; // 变量名
-    const variableContent2 = item[variableName2]; // 变量内容
+ //    const variableName2 = Object.keys(item)[2]; // 变量名
+ //    const variableContent2 = item[variableName2]; // 变量内容
     
-    console.log(variableContent2); // 输出生成的 Vue 代码
+ //    console.log(variableContent2); // 输出生成的 Vue 代码
     
-    // 根据 response.data.length 的值动态给 formData 中的变量赋值
-    let Bname = 'Gd_cpmc' + num;
-    let Bname2= 'sczl_gxmc' + num;
-    let Bname3 = 'sczl_yjGx' + num;
-    formData.value[Bname] = variableContent; // 假设要赋的值是 123
-    formData.value[Bname2] = variableContent1;
-    formData.value[Bname3] = variableContent2;
-    console.log(formData.value[Bname]);
-  }
+ //    // 根据 response.data.length 的值动态给 formData 中的变量赋值
+ //    let Bname = 'Gd_cpmc' + num;
+ //    let Bname2= 'sczl_gxmc' + num;
+ //    let Bname3 = 'sczl_yjGx' + num;
+ //    formData.value[Bname] = variableContent; // 假设要赋的值是 123
+ //    formData.value[Bname2] = variableContent1;
+ //    formData.value[Bname3] = variableContent2;
+ //    console.log(formData.value[Bname]);
+ //  }
 }
 
 
 
 
-// const inputOnclick = (event, inputName) => {
-//  if(formData.value.sczl_gdbh6.length!=7||formData.value.sczl_gdbh5.length!=7||formData.value.sczl_gdbh3.length!=7||formData.value.sczl_gdbh4.length!=7||formData.value.sczl_gdbh2.length!=7||formData.value.sczl_gdbh1.length!=7){
-// 	  	return false
-// 	  }
-// 	  // console.log(inputName);
-// 	  let combinedString = 'formData.value.sczl_gdbh' + inputName;
-// 	  // console.log(combinedString)
-// 	  let variableName = 'sczl_gdbh'+inputName;
-// 	  let variableValue = eval('formData.value.' + variableName);
-// 	 console.log(variableValue)
-// 	  // GetGxMc(combinedString)
-
-// }
-
 const getGxMcsubmit = (event, inputName) => {
  if(formData.value.sczl_gdbh6.length!=7||formData.value.sczl_gdbh5.length!=7||formData.value.sczl_gdbh3.length!=7||formData.value.sczl_gdbh4.length!=7||formData.value.sczl_gdbh2.length!=7||formData.value.sczl_gdbh1.length!=7){
 	  	return false
@@ -728,12 +801,15 @@ const getGxMcsubmit = (event, inputName) => {
 	  let variableValue = eval('formData.value.' + variableName);
 	 console.log(variableValue)
 	  GetGxMc(variableValue,inputName)
-
 }
 
+
 // 搜索
 function onSearch() {
-
+  params.gdbh = positionvalue.value
+  params.type = 'getLocateTable'
+  page.value = 1
+  Getlocate()
 }
 // ============== 表格控制部分结束 ===============
 
@@ -748,7 +824,14 @@ setOptions()
 const multipleSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
-  multipleSelection.value = val
+	if(val.length>0){		
+		multipleSelection.value = val
+		const lenth=val.length
+		lastCellValue=val[lenth-1].UniqId
+		console.log(val)
+		val.splice(0, val.length);  // 清空 val 数组	
+		console.log(lastCellValue)
+	}
 }
 
 // 批量删除控制标记
@@ -807,6 +890,9 @@ const positioningVisible = () => {
     positioningVisibleshow.value = true
 }
 
+const Del = () => {
+   GxMcdel()
+}
 
 const closepositioningVisible = () => {
   positioningVisibleshow.value = false
@@ -839,8 +925,8 @@ const closeDialog = () => {
 // 弹窗确定
 const enterDialog = async () => {
       
-	  formData.value.UniqId=lastCellValue
-      GxMcedit()
+	  // formData.value.UniqId=lastCellValue
+      updateDetailData()
    //    GxMcedit(lastCellValue)
 	 // closeDialog()
 	 // getTableData()
@@ -853,7 +939,7 @@ function doubleClick(row) {
      // console.log(row, column, event);
        // updateCompanyFunc(row);
        type.value = 'update';
-       dialogFormVisible.value = true
+       
 	   lastCellValue= row['UniqId'];
 		 console.log(lastCellValue)
 		 table.value=lastCellValue