first commit

src/api/mes/job.js

@@ -789,3 +789,12 @@ export const inputStash = (data) => {
     data
   })
 }
+
+//面料批次列表
+export const FabricLotList = (params) => {
+  return service({
+    url: '/mes_server/work_order/FabricLotList',
+    method: 'get',
+    params
+  })
+}

src/view/inventory/fabricsummary.vue

@@ -28,23 +28,25 @@
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
 			        <!-- <el-table-column type="selection" width="80" /> -->
-                <el-table-column  align="left" label="订单编号" prop="订单编号" width="105" />
-                <el-table-column  align="left" label="客户编号" prop="客户编号" width="80"/>
-                <el-table-column  align="left" label="生产款号" prop="生产款号" width="170"/>
-                <el-table-column  align="left" label="物料名称" prop="物料名称" width="160"/>
+				<el-table-column  align="left" label="批次号" prop="批次号" width="105" />
+				<el-table-column  align="left" label="关联号" prop="关联号" width="105" />
+                <el-table-column  align="left" label="物料编号" prop="物料编号" width="105" />
+                <el-table-column  align="left" label="物料名称" prop="物料名称" width="80"/>
+                <el-table-column  align="left" label="入仓总量" prop="入仓总量" width="170"/>
+                <el-table-column  align="left" label="库存数量" prop="库存数量" width="160"/>
+                <el-table-column  align="left" label="领用数量" prop="领用数量" width="100"/>
+                <el-table-column  align="left" label="裁切退还" prop="裁切退还" width="100"/>
+                <el-table-column  align="left" label="单位" prop="单位" width="100"/>
+				<el-table-column  align="left" label="实际门幅" prop="实际门幅" width="100"/>
+                <el-table-column  align="left" label="状态" prop="状态" width="130"/>
+                <el-table-column  align="left" label="入仓人员" prop="入仓人员" width="130"/>
+                <el-table-column  align="left" label="入仓日期" prop="入仓日期" width="130"/>
+                <el-table-column  align="left" label="颜色" prop="颜色" width="100"/>
                 <el-table-column  align="left" label="计划用料" prop="计划用料" width="100"/>
                 <el-table-column  align="left" label="定额用料" prop="定额用料" width="100"/>
-                <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="100"/>
-				<el-table-column  align="left" label="定额门幅" prop="定额门幅" width="100"/>
-                <el-table-column  align="left" label="裁床领用面料" prop="裁床领用面料" width="130"/>
-                <el-table-column  align="left" label="裁床实际用料" prop="裁床实际用料" width="130"/>
-                <el-table-column  align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料" width="130"/>
-                <el-table-column  align="left" label="库存总量" prop="入库总量" width="100"/>
-                <el-table-column  align="left" label="面料结余" prop="面料结余" width="100"/>
-                <el-table-column  align="left" label="投料单位" prop="投料单位" width="100"/>
-                <el-table-column  align="left" label="备注" prop="备注" width="150"/>
-				<el-table-column  align="left" label="款式" 	 prop="款式" 	width="170"/>
-                <el-table-column  align="left" label="日期" prop="日期" width="150"/>
+                <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="150"/>
+				<el-table-column  align="left" label="定额门幅" 	 prop="定额门幅" 	width="170"/>
+                <el-table-column  align="left" label="关联订单" prop="关联订单" width="150"/>
                 </el-table>
                 <div class="gva-pagination">
               <el-pagination
@@ -87,7 +89,7 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {getSpotList,getSpotTab,outReport,orderBomList,FabricDetail,fabricList,fabricListmonth} from '@/api/mes/job'
+import {FabricLotList,fabricListmonth} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 import * as XLSX from 'xlsx';
 import FileSaver from 'file-saver';
@@ -113,42 +115,51 @@ const currentDatess = `${year}-${month}`;
 
 
 // 侧边栏数据请求
-const treeData = reactive([])
-	const gettreeData = async () => {
-		const response = await fabricListmonth()
-		if (response.code === 0) {
-			const transformedData = response.data.map(item => ({
-				label: item.date,
-				params: {
-					date: item.date.substring(0, 4) + '-' + item.date.substring(4),
-				},
-			}))
-			treeData.splice(0, treeData.length, ...transformedData)
-		}
-	}
-	gettreeData()
+
+const treeData = reactive([]);
+const getTreeData = async () => {
+  const response = await fabricListmonth();
+  
+  if (response.code === 0) {
+    const transformedData = Object.entries(response.data).map(([key, dates]) => ({
+      label: key,  // 使用"2025-03"作为父节点的label
+      children: dates.map(date => ({
+        label: date,  // 子节点是具体的日期
+        params: {
+          date: date.substring(0, 4) + '-' + date.substring(4), // 格式化日期
+        },
+      })),
+    }));
+
+    // 清空并更新 treeData
+    treeData.splice(0, treeData.length, ...transformedData);
+  }
+};
+
+getTreeData();
 
 const mlscgdformData = reactive({
   日期: '',
 });
 const nodedata = ref('')
 const handleNodeClick = async (node, check) => {
-  console.log(node);
-  nodedata.value = node.label
+	nodedata.value = node.label
+	console.log(nodedata.value);
 	restableData.splice(0, restableData.length);//清空表格
+	
 	//订单信息数据查询【接口】
-	const fabricListdata = await fabricList({order:'',mouth:nodedata.value,page:page.value,limit:pageSize.value});
-  console.log(fabricListdata)
-	restableData.splice(0,fabricListdata.length,...fabricListdata.data.table);
-  total.value = fabricListdata.data.total;
-	}
+	const fabricListdata = await FabricLotList({date:nodedata.value});
+	console.log(fabricListdata)
+	restableData.splice(0,fabricListdata.length,...fabricListdata.data);
+	total.value = fabricListdata.data.total;
+}
 
 const searchInfo = ref('')
   //查询按钮
 const handleSearch = async ()=>{
 	restableData.splice(0, restableData.length);//清空表格
 	//订单信息数据查询【接口】
-	const fabricListdata = await fabricList({order:searchInfo.value,mouth:nodedata.value,page:page.value,limit:pageSize.value});
+	const fabricListdata = await FabricLotList({date:nodedata.value});
   console.log(fabricListdata)
 	restableData.splice(0,fabricListdata.length,...fabricListdata.data.table);
   total.value = fabricListdata.data.total;

src/view/job/processSheet/processSheet.vue

@@ -2,7 +2,7 @@
   <div class="bg">
 	  
     <iframe 
-      src="https://sugar.aipage.com/dashboard/13b183204ae060157f8979a013255132" 
+      src="https://sugar.aipage.com/slider/052a4e6a7cd9698a74831fd43029aac7" 
       frameborder="0" 
       class="iframe-fullscreen" 
       allowfullscreen>
@@ -38,7 +38,7 @@ html, body {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	height: 100vh;
+	height: 87vh;
 	width: 88vw;
 	overflow: hidden;
 	background-color: #000;

src/view/job/sampling/sampling.vue

@@ -517,7 +517,7 @@ import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/w
 import { getSpotList, getSpotTab, getSpotLocal, getSpotInfo, updateSpotData,add } from '@/api/mes/job'
 import { createCompany, deleteCompany, deleteCompanyByIds, findCompany, updateCompany } from '@/api/company'
 
-import{getYg}from '@/api/mes_api_gty/myapi'
+// import{getYg}from '@/api/mes_api_gty/myapi'
 // 全量引入格式化工具 请按需保留
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref,nextTick ,onMounted, onBeforeMount} from 'vue'
@@ -563,15 +563,15 @@ const formData = ref({
   name: '',
 })
 const handleGetYg = async() => {
-  try {
-    const res = await getYg({ sczl_bh: detailData.Sczl_bh })
-    if (res.code === 0) {
-      detailData.name = res.data.ygxm
-	  detailData.Sczl_bh= res.data.员工编号
-    }
-  } catch (e) {
-    console.log(e)
-  }
+  // try {
+  //   const res = await getYg({ sczl_bh: detailData.Sczl_bh })
+  //   if (res.code === 0) {
+  //     detailData.name = res.data.ygxm
+	 //  detailData.Sczl_bh= res.data.员工编号
+  //   }
+  // } catch (e) {
+  //   console.log(e)
+  // }
 }
 
 // 验证规则

src/view/performance/06-packingDocuments/index.vue

@@ -1,1307 +1,11 @@
 <template>
-	<div>
-		<!--    左侧树侧形结构-->
-		<el-container>
-			<layout-sider :resize-directions="['right']" :width="220" style="margin-right: 10px;">
-				<div class="JKWTree-tree" style="height: 70vh;">
-					<h3>包装计件单据维护</h3>
-					<el-tree :data="treeData" highlight-current @node-click="handleNodeClick" />
-				</div>
-			</layout-sider>
-			<el-container>
-				<el-main>
-					<!-- 按钮 -->
-					<div class="gva-table-box">
-						<el-form>
-							<el-form-item>
-								<el-input v-model="searchInfo" placeholder="搜索产品编号或产品名称" clearable style="width: 180px;" />
-								<el-button type="primary" icon="Search" class="search" @click="handleSearch" />
-								<el-button type="primary" icon="edit" class="bt" @click="handleShowDetail">查改</el-button>
-								<el-button type="primary" icon="edit" class="bt" @click="handleShowAdd">新增</el-button>
-								<el-button type="primary" icon="delete" class="bt" @click="handleDelete">删除</el-button>
-							</el-form-item>
-						</el-form>
-						<!-- 数据展示 -->
-						<el-table ref="table" style="width: 100%" :data="tableData" row-key="ID" highlight-current-row
-							border show-overflow-tooltip :row-style="{ height: '20px' }"
-							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-							:header-cell-style="{ padding: '0px' }" @row-dblclick="handleShowDetail"
-							@current-change="(row, oldRow) => { currentRow = row}">
-							<el-table-column type="selection" width="55" />
-							<!-- 循环渲染列 -->
-							<el-table-column v-for=" column in tableColumns " :key="column.prop" :prop="column.prop"
-								:label="column.label" width="110" sortable />
-						</el-table>
-						<!-- 分页 -->
-						<div class="gva-pagination">
-							<el-pagination v-model:current-page="page" v-model:page-size="limit"
-								layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 30, 50, 100]"
-								:total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-						</div>
-					</div>
-						<el-dialog v-model="BzVisible" title="选择" destroy-on-close width="200px"
-							@keydown="selectBZ($event)">
-							<el-table tooltip-effect="dark" :data="selectDataBz" row-key="ID"
-								highlight-current-row="true" border style="width:100%" @row-dblclick="SelectClickBz"
-								ref="table">
-								<el-table-column prop="sczl_bzdh" label="班组" width="150" />
-							</el-table>
-						</el-dialog>
-						<el-dialog v-model="BzVisible2" title="冲月定额" destroy-on-close width="200px"
-							@keydown="selectCY($event)">
-							<el-table tooltip-effect="dark" :data="selectDataCY" row-key="ID"
-								highlight-current-row="true" border style="width:100%"  @row-dblclick="SelectClickCY"
-								ref="table" :row-style="{ height: '30px' }"	>
-								<el-table-column prop="sczl_冲定额" label="冲月定额" width="150"  />
-							</el-table>
-						</el-dialog>
-					<!-- 弹出框 -->
-					<div>
-						<el-dialog v-model="dialogFormVisible" :title="type" destroy-on-close width="1400px">
-							<el-form id="detail-form" :model="detailData" inline label-position="left"
-								@keyup="moveFocus">
-								<el-form-item label="日期">
-									<el-input type="date" max="9999-12-31" @focus="rqHandleFocus()"
-										v-model="detailData.sczl_rq" style="width: 120px;" />
-								</el-form-item>
-
-								<el-form-item label="员工编号">
-									<el-input v-model="detailData.sczl_bh" style="width: 100px;"
-										placeholder="Enter回车" 
-										 />
-									<el-input v-model="detailData.name" style="width: 100px; padding-left: 5px;"
-										@click="selectvalue($event)" readonly />
-								</el-form-item>
-
-								<el-form-item label="组别">
-									<!-- <el-select v-model="detailData.sczl_bzdh" placeholder=" " style="width: 80px" >
-									  <el-option  label="A班" value="A班" />
-									  <el-option label="B班" value="B班" />
-									</el-select> -->
-									<el-input v-model="detailData.sczl_bzdh" style="width: 80px;" @keydown="getBzsubmit($event)" />
-								</el-form-item>
-								<br>
-
-								<el-form-item label="计时时数" style="padding-left: 195px;">
-									<el-input v-model="detailData.sczl_jsss" style="width: 100px;"
-										@click="selectvalue($event)" />
-								</el-form-item>
-
-								<el-form-item label="冲月定额">
-									<!-- <el-select v-model="detailData.sczl_冲定额" placeholder=" " style="width: 100px">
-										<el-option label="" value="" />
-										<el-option label="是" value="是" />
-									</el-select> -->
-									<el-input v-model="detailData.sczl_冲定额" style="width: 80px;" @keydown="getBzsubmit2($event)" />
-								</el-form-item>
-
-								<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="120">
-										<template #default="{ row, $index }">
-											<el-input v-model="row.sczl_gdbh" placeholder="Enter回车"
-												@keyup.enter="handleEnter($index, row)" @keyup  ="movefous($event,row)" />
-										</template>
-									</el-table-column>
-
-									<el-table-column label="印件工序" width="100">
-										<template #default="{ row }">
-											<el-input v-model="row.sczl_yjGx" readonly />
-										</template>
-									</el-table-column>
-
-									<el-table-column label="工序名称" width="100">
-										<template #default="{ row }">
-											<el-input v-model="row.sczl_gxmc" readonly />
-										</template>
-									</el-table-column>
-
-									<el-table-column label="印件名称" width="310">
-										<template #default="{ row }">
-											<el-input v-model="row.Gd_cpmc" readonly />
-										</template>
-									</el-table-column>
-									
-									<el-table-column label="核算标准">
-										<template #default="{ row }">
-											<el-select v-model="row.hsbz" placeholder="请选择">
-												<el-option label="1000" value="1000"></el-option>
-												<el-option label="2500" value="2500"></el-option>
-											</el-select>
-										</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="95">
-										<template #default="{ row }">
-											<el-input v-model="row.sczl_返工产量" />
-										</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="95">
-										<template #default="{ row }">
-											<el-input v-model="row.sczl_计产系数" />
-										</template>
-									</el-table-column>
-
-									<el-table-column label="来源" width="95">
-										<template #default="{ row }">
-											<el-input v-model="row.sczl_Jtbh1" 
-											@keyup  ="movefous2($event,row)"/>
-										</template>
-									</el-table-column>
-
-									<el-table-column label="定额代号" width="130">
-										<template #default="{ row, $index }">
-											<el-input id="input" v-model="row.sczl_dedh"
-												@keyup.enter="getDedhsubmit($index, row)" />
-										</template>
-									</el-table-column>
-
-								</el-table>
-
-								<el-form-item label="其他备注" style="margin-top: 10px;">
-									<el-input v-model="detailData.sczl_desc" />
-								</el-form-item>
-
-							</el-form>
-
-							<template #footer>
-								<div class="dialog-footer">
-									<el-button @click="dialogFormVisible = false">取 消</el-button>
-									<el-button type="primary" @click="enterDialog">确 定
-									</el-button>
-								</div>
-							</template>
-						</el-dialog>
-
-
-						<!-- 新增定额代号 -->
-						<el-dialog v-model="dedhsearchModel" :before-close="() => dedhsearchModel = false" @opened="focusFirstNode">
-							<el-form>
-								<div>
-									<el-form-item label="定额代号 :" class="mab" prop="keyOrder">
-									</el-form-item>
-
-									<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
-										<el-tree ref="table_dedh" node-key="id" :data="dedhtreeData" :props="{
-		            children: 'children',
-		            label: 'label',
-		          }"   @node-click="dedhhandleNodeClick"></el-tree>
-									</div>
-
-
-								</div>
-							</el-form>
-						</el-dialog>
-
-
-						<!-- 弹出选项框 -->
-						<el-dialog v-model="dialogSelectVisible" title="选择" destroy-on-close width="800px"
-							@keydown="selectCP($event)">
-							<el-table tooltip-effect="dark" :data="selectData" row-key="ID" highlight-current-row border
-								style="width:100%" @row-dblclick="handleSelectClick" ref="table2">
-								<el-table-column prop="Gd_cpmc" label="产品名称" width="460" />
-								<el-table-column prop="Gy0_gxmc" label="工序" width="200" />
-								<el-table-column prop="jyGx" label="工序编号" width="100" />
-							</el-table>
-						</el-dialog>
-					</div>
-					
-					<!-- 员工选择 -->
-					<el-dialog v-model="dialogSelectVisible_Yg" title="选择" destroy-on-close width="300px"
-						@keydown="selectGX_Yg($event)">
-						<el-table tooltip-effect="dark" :data="selectData_Yg" row-key="ID" highlight-current-row="true"
-							border style="width:100%" @row-dblclick="handleSelectClick_Yg" ref="table_Yg">
-							<el-table-column prop="员工编号" label="员工编号" width="100" />
-							<el-table-column prop="ygxm" label="员工姓名" width="200" />
-						</el-table>
-					</el-dialog>
-					
-					<!-- 班组选择 -->
-					<el-dialog v-model="dialogSelectVisible_Bz" title="选择" destroy-on-close width="200px"
-						@keydown="selectGX_Bz($event)">
-						<el-table tooltip-effect="dark" :data="selectData_Bz" row-key="ID" highlight-current-row="true"
-							border style="width:100%" @row-dblclick="handleSelectClick_Bz" ref="table_Bz">
-							<el-table-column prop="sczl_bzdh" label="班组" width="160" />
-						</el-table>
-					</el-dialog>
-
-				</el-main>
-			</el-container>
-		</el-container>
-	</div>
+	
 </template>
 
 <script>
 </script>
 
 
-<script setup>
-	import {
-		Layout,
-		LayoutContent,
-		LayoutHeader,
-		LayoutSider
-	} from '@arco-design/web-vue'
-	import {
-		ElMessage,
-		ElMessageBox,
-		dayjs
-	} from 'element-plus'
-
-	// import { Download, Search, Delete } from '@element-plus/icons-vue'
-	import {
-		reactive,
-		ref,
-		nextTick,
-		onMounted
-	} from 'vue'
-	import {
-		getGxMc,
-		getInfo,
-		getLocate,
-		getPackingSideTable,
-		getPackingTable,
-		updatePackingTable,
-		getYg,
-		DeletePackingTable,
-		addPackingTable,
-		getDedh
-	} from '@/api/mes_api_gty/myapi'
-	import {
-		useUserStore
-	} from '@/pinia/modules/user'
-	const userStore = useUserStore()
-	const sys_id = '[' + userStore.userInfo.userName + '/' + userStore.userInfo.nickName + ']'
-	defineOptions({
-		name: '06PackingDocuments',
-	})
-	//班组
-	const BzVisible = ref (false)
-	//
-	const BzVisible2 = ref (false)
-	const selectDataBz = reactive([])
-	const selectDataCY = reactive([])
-const SelectClickBz = (row, column, event) => {
-	detailData.sczl_bzdh = row.sczl_bzdh
-		BzVisible.value = false
-	}
-	const selectBZ = (event) => {
-		if (event.keyCode === 40) { // Enter 或向下箭头
-			setCurrent(selectDataBz[1]);
-
-		} else if (event.keyCode === 38) {
-			setCurrent(selectDataBz[0]);
-
-		} else if (event.keyCode === 13) {
-			BzVisible.value = false
-		}
-
-	}
-	const selectCY = (event) => {
-		if (event.keyCode === 40) { // Enter 或向下箭头
-			setCurrent2(selectDataCY[1]);
-
-		} else if (event.keyCode === 38) {
-			setCurrent2(selectDataCY[0]);
-
-		} else if (event.keyCode === 13) {
-			BzVisible2.value = false
-		}
-
-	}
-	const SelectClickCY = (row, column, event) => {
-		detailData.sczl_冲定额 = row.sczl_冲定额
-		BzVisible2.value = false
-	}
-	// 侧边栏功能
-	const treeData = reactive([])
-	const getSideData = async () => {
-		try {
-			const response = await getPackingSideTable()
-			if (response.code === 0) {
-				const transformedData = response.data.map(item => ({
-					label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
-					children: item.sys.map(sysItem => ({
-						label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
-						params: {
-							date: item.date.replace(/\./g, '-'),
-							sys_id: sysItem.sys_id,
-						},
-					})),
-				}))
-				treeData.splice(0, treeData.length, ...transformedData)
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-	getSideData()
-
-	// 表格功能
-	const tableColumns = [{
-			label: '员工编号',
-			prop: 'sczl_bh',
-			width: '100'
-		},
-		{
-			label: '员工姓名',
-			prop: 'name',
-			width: '100'
-		},
-		{
-			label: '生产日期',
-			prop: 'sczl_rq',
-			width: '100'
-		},
-		{
-			label: '班组',
-			prop: 'sczl_bzdh',
-			width: '100'
-		},
-		{
-			label: '包装产量',
-			prop: 'sczl_cl',
-			width: '100'
-		},
-		{
-			label: '返工产量',
-			prop: 'sczl_fgsl',
-			width: '100'
-		},
-		{
-			label: '计件产量',
-			prop: 'sczl_jjcl',
-			width: '100'
-		},
-		{
-			label: '相关工单',
-			prop: 'sczl_gdbh1',
-			width: '100'
-		},
-		{
-			label: '创建用户',
-			prop: 'sys_id',
-			width: '120'
-		},
-		{
-			label: '创建时间',
-			prop: 'sys_rq',
-			width: '180'
-		},
-		{
-			label: '修改时间',
-			prop: 'mod_rq',
-			width: '180'
-		},
-		{
-			label: 'UNIQID',
-			prop: 'UniqId',
-			width: '100'
-		},
-	]
-	const tableData = reactive([])
-	const params = {
-		type: '',
-		date: '',
-		sys_id: '',
-		gdbh: '',
-	}
-
-	const total = ref(0)
-	const page = ref(1)
-	const limit = ref(10)
-
-	const type = ref('')
-	const searchInfo = ref('')
-	const currentRow = ref({})
-	// const multipleSelection = ref([])
-
-	// 获取列表数据
-	const getTableData = async () => {
-		try {
-			const response = await getPackingTable({
-				date: params.date,
-				sys_id: params.sys_id,
-				page: page.value.toString(),
-				limit: limit.value.toString(),
-			})
-			if (response.code === 0) {
-				total.value = response.data.total
-				tableData.splice(0, tableData.length, ...response.data.rows)
-				setCurrent(tableData[0])
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-	// 获取定位数据
-	const getLocateTable = async () => {
-		try {
-			const response = await getLocate({
-				gdbh: params.gdbh,
-				page: page.value.toString(),
-				limit: limit.value.toString(),
-			})
-			if (response.code === 0) {
-				total.value = response.data.total
-				tableData.splice(0, tableData.length, ...response.data.rows)
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-	// 删除数据
-	const deleteTableData = async (id) => {
-		try {
-			const res = await DeletePackingTable({
-				UniqId: id
-			})
-			if (res.code === 0) {
-				return 0
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-
-	const handleNodeClick = (node, check) => {
-		if (node.params) {
-			params.date = node.params.date
-			params.sys_id = node.params.sys_id
-			params.type = 'getTableData'
-			page.value = 1
-			getTableData()
-		}
-	}
-
-	const selectvalue = (e) => {
-		console.log(e)
-		e.currentTarget.select();
-	}
-	// 定位
-	const handleSearch = () => {
-		params.gdbh = searchInfo.value
-		params.type = 'getLocateTable'
-		page.value = 1
-		getLocateTable()
-	}
-
-	// 查改
-	const handleShowDetail = () => {
-		type.value = '查改'
-		console.log(currentRow.value)
-		if (currentRow.value.UniqId == undefined) {
-			ElMessage({
-				type: 'warning',
-				message: '未选中记录',
-			})
-			return
-		} else {
-			getTableInfo(currentRow.value?.UniqId)
-		}
-	}
-
-	// 删除
-	const handleDelete = () => {
-		if (currentRow.value.UniqId == undefined) {
-			ElMessage({
-				type: 'warning',
-				message: '未选中记录',
-			})
-			return
-		}
-		ElMessageBox.confirm(
-				`确认删除这条数据么?`,
-				'警告', {
-					confirmButtonText: '确认',
-					cancelButtonText: '取消',
-					type: 'warning',
-				}
-			)
-			.then(async () => {
-				const ret = await deleteTableData(currentRow.value?.UniqId)
-				if (ret === 0) {
-					ElMessage({
-						type: 'success',
-						message: '删除成功',
-					})
-					getSideData()
-					getTableData()
-				} else {
-					ElMessage({
-						type: 'error',
-						message: '删除失败',
-					})
-				}
-			})
-			.catch(() => {
-				ElMessage({
-					type: 'info',
-					message: '取消删除',
-				})
-			})
-	}
-	// 分页
-	// #region
-	const handleSizeChange = () => {
-		switch (params.type) {
-			case 'getTableData':
-				getTableData()
-				break
-			case 'getLocateTable':
-				getLocateTable()
-				break
-			default:
-				break
-		}
-	}
-	const handleCurrentChange = () => {
-		switch (params.type) {
-			case 'getTableData':
-				getTableData()
-				break
-			case 'getLocateTable':
-				getLocateTable()
-				break
-			default:
-				break
-		}
-	}
-	// #endregion
-
-	// 详情界面
-	const detailData = reactive({
-		UniqId: '',
-		selectIndex: 0,
-		sczl_rq: '',
-		sczl_bh: '',
-		name: '',
-		sczl_bzdh: '',
-		sczl_jsss: '',
-		sczl_冲定额: '',
-		sczl_desc: '',
-		table: [],
-	})
-	const selectData = reactive([])
-	const table = ref()
-
-	// 弹窗控制标记
-	const dialogFormVisible = ref(false)
-	const dialogSelectVisible = ref(false)
-
-	const setCurrent = (row) => {
-		table.value?.setCurrentRow(row)
-		detailData.sczl_bzdh = row.sczl_bzdh
-		detailData.sczl_冲定额 = row.sczl_冲定额
-	}
-	const setCurrent2 = (row) => {
-		table.value?.setCurrentRow(row)
-		detailData.sczl_冲定额 = row.sczl_冲定额
-	}
-	// 获取详细信息
-	const getTableInfo = async (id) => {
-		try {
-			const response = await getInfo({
-				UniqId: id
-			})
-			if (response.code === 0) {
-				const {
-					sczl_rq,
-					sczl_bh,
-					name,
-					sczl_bzdh,
-					sczl_jsss,
-					sczl_冲定额,
-					sczl_desc,
-					...rest
-				} = response.data
-				Object.assign(detailData, {
-					sczl_rq,
-					sczl_bh,
-					name,
-					sczl_bzdh,
-					sczl_jsss,
-					sczl_冲定额,
-					sczl_desc
-				})
-				detailData.table = Array.from({
-						length: 6
-					}, (_, i) => i + 1)
-					.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}`],
-							hsbz:rest[`sczl_type${num}`],
-							sczl_返工产量: rest[`sczl_返工产量${num}`],
-							sczl_PgCl: rest[`sczl_PgCl${num}`],
-							sczl_计产系数: rest[`sczl_计产系数${num}`],
-							sczl_Jtbh1: rest[`sczl_Jtbh${num}`],
-							sczl_dedh: rest[`sczl_dedh${num}`],
-						}
-					})
-
-				if (type.value === '新增') {
-					console.log(detailData)
-					// detailData.name = ''
-					// detailData.sczl_bh = ''
-					// detailData.sczl_bzdh = ''
-					// detailData.sczl_desc = ''
-					// detailData.sczl_jsss = ''
-					// detailData.sczl_rq = ''
-					detailData.table.forEach(row => {
-						for (const key in row) {
-							if ( key === 'sczl_cl'){
-								row[key] = '' // 清空每行的内容
-							}
-
-						}
-					})
-				} else {
-					detailData.UniqId = id
-					dialogFormVisible.value = true
-				}
-
-				if (type.value === '新增' || type.value === '查改') {
-					detailData.UniqId = id
-					dialogFormVisible.value = true
-
-					// 在 setTimeout 中获取元素，确保在 DOM 渲染完毕后执行
-					setTimeout(() => {
-						formElements = document.getElementById('detail-form').elements
-						formElements[0].focus()
-					}, 0)
-				}
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-
-	//日期获得焦点事件
-	const rqHandleFocus = () => {
-		if (detailData.sczl_rq == '') {
-			detailData.sczl_rq = new Date().toISOString().split('T')[0]
-		}
-	}
-
-	// 获取工序名称
-	const getTableGxMc = async (index, row) => {
-		try {
-			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)
-					setCPCurrent(selectData[0])
-					detailData.selectIndex = index
-					dialogSelectVisible.value = true
-				}
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-
-	// 更新数据
-	const updateDetailData = async () => {
-		const restoredData = {
-			UniqId: detailData.UniqId,
-			sczl_rq: detailData.sczl_rq,
-			sczl_bh: detailData.sczl_bh,
-			name: detailData.name,
-			sczl_bzdh: detailData.sczl_bzdh,
-			sczl_jsss: detailData.sczl_jsss,
-			sczl_冲定额: detailData.sczl_冲定额,
-			sczl_desc: detailData.sczl_desc,
-		}
-		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[`sczl_type${num}`] = item.hsbz === undefined ? '' : item.hsbz;
-			restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
-			restoredData[`sczl_cl${num}`] = item.sczl_cl
-			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
-			restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
-			restoredData[`sczl_计产系数${num}`] = item.sczl_计产系数
-			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
-			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
-		})
-		console.log(restoredData)
-		// return false;
-		const res = await updatePackingTable(restoredData)
-		if (res.code === 0) {
-			ElMessage({
-				type: 'success',
-				message: '更新成功',
-			})
-			dialogFormVisible.value = false
-		}
-	}
-
-	// 新增数据
-	const handleShowAdd = async () => {
-		type.value = '新增'
-		if (currentRow.value.UniqId == null) {
-			detailData.table = Array.from({
-					length: 6
-				}, (_, i) => i + 1)
-				.map(num => {
-					return {
-						sczl_gdbh: '',
-						sczl_yjGx: '',
-						sczl_gxmc: '',
-						Gd_cpmc: '',
-						sczl_cl: '',
-						sczl_返工产量: '',
-						sczl_PgCl: '',
-						sczl_计产系数: '',
-						sczl_Jtbh1: '',
-						sczl_dedh: '',
-					}
-				})
-			setTimeout(() => {
-				formElements = document.getElementById('detail-form').elements
-				formElements[0].focus()
-			}, 0)
-			dialogFormVisible.value = true
-		} else {
-			await getTableInfo(currentRow.value?.UniqId)
-			// 默认日期为前一天的日期
-			const date = dayjs().subtract(1, 'day').format('YYYY-MM-DD')
-			detailData.sczl_rq = date
-		}
-	}
-	const addDetailData = async () => {
-		const restoredData = {
-			sys_id: sys_id,
-			sczl_rq: detailData.sczl_rq,
-			sczl_bh: detailData.sczl_bh,
-			// name: detailData.name,
-			sczl_bzdh: detailData.sczl_bzdh,
-			sczl_jsss: detailData.sczl_jsss,
-			sczl_冲定额: detailData.sczl_冲定额,
-			sczl_desc: detailData.sczl_desc,
-		}
-		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[`sczl_type${num}`] = item.hsbz === undefined ? '' : item.hsbz;
-			// restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
-			restoredData[`sczl_cl${num}`] = item.sczl_cl
-			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
-			restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
-			restoredData[`sczl_计产系数${num}`] = item.sczl_计产系数
-			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
-			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
-		})
-	
-		const res = await addPackingTable(restoredData)
-		if (res.code === 0) {
-			ElMessage({
-				type: 'success',
-				message: '新增成功',
-			})
-			dialogFormVisible.value = false
-			if (params.date != '') {
-				getTableData()
-			}
-			getSideData()
-		}
-	}
-	//弹出框回车事件
-	const handleGetYg = async () => {
-		if (detailData.sczl_bh == '') {
-			formElements = document.getElementById('detail-form').elements
-			formElements[3].focus()
-			formElements[3].select()
-			return
-		}
-		try {
-			const response = await getYg({ sczl_bh: detailData.sczl_bh })
-			if (response.code == 0) {
-				if (response.data.length == 1) {
-					detailData.name = response.data[0].ygxm
-					detailData.sczl_bh = response.data[0].员工编号
-					detailData.sczl_jsss = "0"
-					// detailData.sczl_冲定额 = "0"
-					formElements = document.getElementById('detail-form').elements
-					formElements[3].focus()
-					formElements[3].select()
-				} else if (response.data.length > 1) {
-					selectData_Yg.splice(0, selectData_Yg.length, ...response.data)
-					setGXCurrent_Yg(selectData_Yg[0])
-					dialogSelectVisible_Yg.value = true
-				} else {
-					ElMessage({
-						type: 'warning',
-						message: '未查询到该员工'
-					})
-					detailData.name = ''
-					detailData.sczl_bh = ''
-				}
-			} else {
-				detailData.name = '';
-				detailData.sczl_bh = '';
-			}
-		} catch (e) {
-			console.log(e)
-		}
-	}
-	const dialogSelectVisible_Yg = ref(false)
-	const selectData_Yg = reactive([])
-	// 处理选择框
-	const handleSelectClick_Yg = (row, column, event) => {
-		detailData.name = row.ygxm
-		detailData.sczl_bh = row.员工编号
-		dialogSelectVisible_Yg.value = false
-		formElements = document.getElementById('detail-form').elements
-		formElements[3].focus()
-		formElements[3].select()
-	}
-	const currentIndex_Yg = ref(0);
-	const GXCurrent_Yg = ref(0);
-	const selectGX_Yg = (event) => {
-		if (event.keyCode === 40) { // 向下箭头
-			if (currentIndex_Yg.value < selectData_Yg.length - 1) {
-				currentIndex_Yg.value++;
-				setGXCurrent_Yg(selectData_Yg[currentIndex_Yg.value]);
-			} else {
-				currentIndex_Yg.value = 0;
-				setGXCurrent_Yg(selectData_Yg[currentIndex_Yg.value]); // 到达最后一行时回到第一行			
-			}
-		} else if (event.keyCode === 38) { // 向上箭头
-			if (currentIndex_Yg.value > 0) {
-				currentIndex_Yg.value--;
-				setGXCurrent_Yg(selectData_Yg[currentIndex_Yg.value]);
-			} else {
-				currentIndex_Yg.value = selectData_Yg.length - 1;
-				setGXCurrent_Yg(selectData_Yg[currentIndex_Yg.value]); // 到达第一行时回到最后一行
-			}
-		} else if (event.keyCode === 13) { // 回车键
-			dialogSelectVisible_Yg.value = false;
-			formElements = document.getElementById('detail-form').elements
-			formElements[3].focus()
-			formElements[3].select()
-		}
-	}
-	const table_Yg = ref()
-	const setGXCurrent_Yg = (row) => {
-		setTimeout(() => {
-			table_Yg.value?.setCurrentRow(row)
-			detailData.name = row.ygxm
-			detailData.sczl_bh = row.员工编号
-		})
-	}
-
-	//班组回车事件
-	const getBzsubmit = (event) => {
-		if (event.keyCode !== 37){
-		//弹出选择
-		const data = [{
-			'sczl_bzdh': 'A班'
-		}, {
-			'sczl_bzdh': 'B班'
-		}]
-		selectDataBz.splice(0, selectDataBz.length, ...data)
-		if (dialogSelectVisible_Yg.value == false){
-			BzVisible.value = true
-		}
-
-		setCurrent(data[0])
-		}
-
-	}
-	//冲月定额
-	const getBzsubmit2 = (event) => {
-		if (event.keyCode !== 37) {
-			const data = [{
-			'sczl_冲定额': ' '
-		}, {
-			'sczl_冲定额': '否'
-		}]
-		selectDataCY.splice(0, selectDataCY.length, ...data)
-		BzVisible2.value = true
-		setCurrent2(data[0])
-		}
-	}
-	const dialogSelectVisible_Bz = ref(false)
-	const selectData_Bz = reactive([])
-	// 处理选择框
-	const handleSelectClick_Bz = (row, column, event) => {
-		detailData.sczl_bzdh = row.sczl_bzdh
-		dialogSelectVisible_Bz.value = false
-	}
-	const currentIndex_Bz = ref(0);
-	const GXCurrent_Bz = ref(0);
-	const selectGX_Bz = (event) => {
-		if (event.keyCode === 40) { // 向下箭头
-			if (currentIndex_Bz.value < selectData_Bz.length - 1) {
-				currentIndex_Bz.value++;
-				setGXCurrent_Bz(selectData_Bz[currentIndex_Bz.value]);
-			} else {
-				currentIndex_Bz.value = 0;
-				setGXCurrent_Bz(selectData_Bz[currentIndex_Bz.value]); // 到达最后一行时回到第一行			
-			}
-		} else if (event.keyCode === 38) { // 向上箭头
-			if (currentIndex_Bz.value > 0) {
-				currentIndex_Bz.value--;
-				setGXCurrent_Bz(selectData_Bz[currentIndex_Bz.value]);
-			} else {
-				currentIndex_Bz.value = selectData_Bz.length - 1;
-				setGXCurrent_Bz(selectData_Bz[currentIndex_Bz.value]); // 到达第一行时回到最后一行
-			}
-		} else if (event.keyCode === 13) { // 回车键
-			dialogSelectVisible_Bz.value = false;
-		}
-	}
-	const table_Bz = ref()
-	const setGXCurrent_Bz = (row) => {
-		setTimeout(() => {
-			table_Bz.value?.setCurrentRow(row)
-			detailData.sczl_bzdh = row.sczl_bzdh
-		})
-	}
-	
-	// 处理选择框回车操作
-	const handleEnter = (index, row) => {
-		detailData.table[index].sczl_dedh = '030002001'
-		if (row.sczl_gdbh === '') {
-			detailData.table[index].sczl_yjGx = ''
-			detailData.table[index].sczl_gxmc = ''
-			detailData.table[index].Gd_cpmc = ''
-		} else {
-			getTableGxMc(index, row)
-		}
-	}
-
-	// 处理选择框
-	const handleSelectClick = (row, column, event) => {
-		const {
-			Gd_cpmc,
-			Gy0_gxmc,
-			jyGx
-		} = row
-		const index = detailData.selectIndex
-		detailData.table[index].Gd_cpmc = Gd_cpmc
-		detailData.table[index].sczl_yjGx = jyGx
-		detailData.table[index].sczl_gxmc = Gy0_gxmc
-		dialogSelectVisible.value = false
-	}
-	const table2 = ref()
-	const setCPCurrent = (row) => {
-		setTimeout(() => {
-			table2.value?.setCurrentRow(row)
-			const {
-				Gd_cpmc,
-				Gy0_gxmc,
-				jyGx
-			} = row
-			const index = detailData.selectIndex
-			detailData.table[index].Gd_cpmc = Gd_cpmc
-			detailData.table[index].sczl_yjGx = jyGx
-			detailData.table[index].sczl_gxmc = Gy0_gxmc
-		})
-	}
-	const CPIndex = ref(0);
-	const JYCurrent = ref(0);
-	const selectCP = (event) => {
-		if (event.keyCode === 40) { // 向下箭头
-			if (CPIndex.value < selectData.length - 1) {
-				CPIndex.value++;
-				setCPCurrent(selectData[CPIndex.value]);
-			} else {
-				CPIndex.value = 0;
-				setCPCurrent(selectData[CPIndex.value]); // 到达最后一行时回到第一行			
-			}
-		} else if (event.keyCode === 38) { // 向上箭头
-			if (CPIndex.value > 0) {
-				CPIndex.value--;
-				setCPCurrent(selectData[CPIndex.value]);
-			} else {
-				CPIndex.value = selectData.length - 1;
-				setCPCurrent(selectData[CPIndex.value]); // 到达第一行时回到最后一行
-			}
-		} else if (event.keyCode === 13) { // 回车键
-			dialogSelectVisible.value = false
-
-		}
-	}
-	// 弹窗确定
-	const enterDialog = () => {
-		if (type.value === '查改') {
-			updateDetailData()
-		} else if (type.value === '新增') {
-			addDetailData()
-		}
-	}
-
-
-	//新增定额代号
-	const dedhsearchModel = ref(false)
-	const dedhtreeData = ref([])
-	const table_dedh =ref()
-	const _index = ref(null)
-	// 定额代号回车事件
-	const getDedhsubmit = async (index, row) => {
-		if(detailData.table[index].sczl_dedh == '030002001'){
-			return
-		}
-		_index.value = index
-		dedhsearchModel.value = true;
-		const getPieceWorks = await getDedh();
-		console.log(getPieceWorks);
-	if (getPieceWorks.code === 0) {
-		const transformItems = (items,indexs) => {
-	        return items.map((item,index) => ({
-	            id: `${indexs}-${index}`,
-	            label: `${item.sys_mc}【${item.sys_bh}】`,
-	            params: {
-	                code: item.sys_bh
-	            },
-	            children: item.bh_mc ? transformItems(item.bh_mc) : []
-	        }));
-	    };
-	
-	    const transformedData2 = getPieceWorks.data.map((topItem,indexs) => ({
-			id: indexs,
-	        label: `${topItem.sys_mc}【${topItem.sys_bh}】`,
-	        params: {
-	            code: topItem.sys_bh
-	        },
-	        children: topItem.bh_mc ? transformItems(topItem.bh_mc,indexs) : []
-	    }));
-	
-	    dedhtreeData.value = transformedData2;
-		console.log(transformedData2);
-		  nextTick(() => {
-		    // 手动设置选中节点，如果默认选中不生效，可以使用此方法
-		    if (table_dedh.value) {
-			  const tree = table_dedh.value?.$el; // 访问组件实例的 $el
-			    if (tree) {
-			      // 通过DOM选择器查找节点
-			      const node = tree.querySelector('[data-key="0"]');
-			      if (node) {
-			        node.scrollIntoView();
-			        node.focus(); // 假设节点是可聚焦的
-			      }
-			    }
-				
-		    }
-		  });
-	}
-	};
-
-	// 点击定额代号
-	const dedhhandleNodeClick = (node, check) => {
-		console.log(node);
-		console.log(node.params.code);
-		if (node.children && node.children.length > 0) {
-			console.log(11);
-		} else {
-			detailData.table[_index.value].sczl_dedh = node.params.code
-			dedhsearchModel.value = false;
-		}
-		// dedhsearchModel.value = false;
-	};
-
-
-
-
-	let flag_Bz = true
-	let formElements
-	const moveFocus = (event) => {
-		// console.log(formElements);
-    const index = Array.from(formElements).indexOf(event.target);
-    const key = event.key;
-	// console.log(detailData);
-	const currentInputValue = formElements[index].value;
-    event.preventDefault();
-    switch (index) {
-        case 0:
-            if (key === 'ArrowRight' ) {
-                formElements[1].focus();
-                formElements[1].select();
-            } else if (key === 'ArrowLeft') {
-                formElements[formElements.length - 1].focus();
-                formElements[formElements.length - 1].select();
-            } else if (key === 'Enter') {
-                formElements[1].focus();
-                formElements[1].select();
-            }
-            break;
-        case 1:
-            if (key === 'ArrowRight') {
-                formElements[3].focus();
-                formElements[3].select();
-            } else if (key === 'ArrowLeft') {
-                formElements[0].focus();
-                formElements[0].select();
-            } else if (key === 'Enter') {
-                handleGetYg();
-            }
-            break;
-
-        case 3:
-            if (key === 'ArrowRight') {
-
-                formElements[4].focus();
-                formElements[4].select();
-            } else if (key === 'ArrowLeft') {
-                formElements[1].focus();
-                formElements[1].select();
-            } else if (key === 'Enter') {
-                formElements[4].focus();
-                formElements[4].select();
-            }
-            break;
-
-        case formElements.length - 1:
-            if (key === 'ArrowRight') {
-                formElements[0].focus();
-                formElements[0].select();
-            } else if (key === 'ArrowLeft') {
-                formElements[index - 1].focus();
-                formElements[index - 1].select();
-            } else if (key === 'Enter') {
-                formElements[0].focus();
-                formElements[0].select();
-            }
-            break;
-
-        default:
-            if (key === 'ArrowRight') {
-                formElements[index + 1].focus();
-                formElements[index + 1].select();
-            } else if (key === 'ArrowLeft') {
-                formElements[index - 1].focus();
-                formElements[index - 1].select();
-            } else if (key === 'Enter') {
-                formElements[index + 1].focus();
-                formElements[index + 1].select();
-            }
-            break;
-    }
-};
-	const movefous2 = (event,row,index)=>{
-		const index2 = Array.from(formElements).indexOf(event.target)
-			if (row.sczl_dedh != '' & event.key === "ArrowRight"){
-				event.stopPropagation();
-				formElements[index2+2].focus();
-				formElements[index2+2].select();
-			}
-	}
-	const movefous = (event,row,index)=>{
-		const index2 = Array.from(formElements).indexOf(event.target)
-			if (row.sczl_dedh != '' & event.key === "ArrowLeft"){
-				event.stopPropagation();
-				formElements[index2-2].focus();
-				formElements[index2-2].select();
-			}
-	}
-</script>
-
-<style scoped>
-	:deep(.plan-usage-low div) {
-		color: red !important;
-	}
-
-	.JKWTree-container {
-		display: flex;
-	}
-
-	.JKWTree-tree {
-		width: 100%;
-		background-color: #fff;
-		/*background-color: rgba(241, 224, 224, 0.99);*/
-		padding: 10px;
-		margin-right: 20px;
-	}
-
-	.JKWTree-tree h3 {
-		font-size: 15px;
-		font-weight: 700;
-		margin: 10px 0;
-	}
-
-	.JKWTree-content {
-		flex: 1;
-	}
-
-	:deep(.el-table__body .warning-row) {
-		background: #FFFF80 !important;
-	}
-
-	/* 选中某行时的背景色 */
-	:deep(.el-table__body tr.current-row)>td {
-		background: #ff80ff !important;
-	}
-
-	:deep(.el-table .bg-yellow) {
-		background: yellow;
-	}
-</style>
 <style scoped>
-	:deep(.el-table td .cell) {
-		line-height: 25px !important;
-	}
-
-	:deep(.el-tabs__header) {
-		margin-bottom: 0;
-	}
-
-	.search {
-		margin-left: 0px !important;
-		margin-right: 10px !important;
-	}
-
-	.bt {
-		margin-left: 2px !important;
-		padding: 3px !important;
-		font-size: 12px;
-
-	}
-
-	.el-tabs__header {
-		margin: 0px !important;
-	}
-
-	.gva-table-box {
-		padding: 0px !important;
-	}
-
-	.mab {
-		margin-bottom: 5px;
-	}
+	
 </style>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -220,22 +220,21 @@
 						  :summary-method="mlgetSummaries" 
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
-				  <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" label="物料编号" prop="物料编号"  width="110"/>
-				  <el-table-column align="left" label="材料分类" prop="材料分类"  width="110"/>
-                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+				  <!-- <el-table-column type="selection" width="30" /> -->
+                  <el-table-column align="left" label="物料编号" prop="BOM_物料编码"  width="180"/>
+				  <el-table-column align="left" label="物料名称" prop="物料名称"  width="180"/>
 				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
-                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="110" />
-				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="110"/>
+                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="115" />
+				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/>
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
-				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="110"/>
-				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="110"/>
+				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
+				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="115"/>
                   <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="120"/>
                   <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="120"/>
 				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
-				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="110"/>
-				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="110"/>
-				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
+				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="115"/>
+				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="115"/>
+				  <el-table-column align="left" label="单位" prop="投料单位"  width="90"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
 				  <el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
@@ -357,7 +356,7 @@
 			
 			<!-- 新增订单资料弹窗 -->
 		<el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog" title="新增订单资料" 
-			style="height: 98%;width:67%;margin: 10px 0px 0px 15%;" top="1%" destroy-on-close>
+			style="height: 100%;width:90%;margin: 0px 0px 0px 6%;" top="0%" destroy-on-close>
 		  <div style="display: flex; justify-content: space-between;">
 		    <div style="flex: 2;">
 		      <el-form :model="add_gdscgdformData">
@@ -429,7 +428,7 @@
 		          <el-input
 		            type="textarea"
 		            v-model="add_gdscgdformData['船样描述']" id="船样描述"
-		            rows="2"
+		            rows="1"
 		            resize="none"
 		            @keydown="add_gdzlent($event, '备注', '船样描述', '船样合计')"
 		          />
@@ -469,10 +468,8 @@
 		          <el-date-picker v-model="add_gdscgdformData['制单日期']" disabled type="date"  style='width: 200px;'/>
 		        </el-form-item>
 		      </el-form>
-			  <el-button type="primary" @click="Related_fabrics" 
-				  style="height: 50px;font-size: 20px; margin-left: 120px;
-						
-				  ">
+			 <el-button type="primary" @click="Related_fabrics" 
+				  style="width: 160px;height: 45px;font-size: 20px; margin-left: 120px;">
 					关联订单面料
 			  </el-button>
 		    </div>
@@ -504,7 +501,6 @@
 		          </el-form-item>
 		        </div>
 				<div style="flex: 1;">
-					
 				  <!-- <el-form-item label="" class="mab" prop="isBanciSelected" label-width="90">
 				    <el-checkbox 
 				      v-model="add_gdscgdformData['合并']" 
@@ -517,40 +513,35 @@
 		      </div>
 		    </el-form>
 		  </div>
+		  
+		  <el-tag><span style="font-size: 18px;margin-left: 10px;">关联订单面料明细</span></el-tag>
 		  <el-table ref="multipleTable"
-                          :row-style="{ height: '30px' }"
-                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                          :header-cell-style="{ padding: '0px' }"
-                          :show-overflow-tooltip="true"
-                          :cell-class-name="planUsageCellClass"
-                          highlight-current-row="true"
-                          @row-dblclick="bombomupdateCompanyFunc2"
-						  @selection-change="glddSelectionChange2"
-                          style="width: 100%;height: 30vh" border tooltip-effect="dark" :data="zsglddtableData" row-key="ID">
-                 <el-table-column type="selection" width="40" />
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
-				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="160"/>
-				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="160"/>
-				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
-                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="90"/>
-				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="90"/>
-                  <el-table-column align="left" label="款式" prop="款式"  width="110" />
-				  <el-table-column
-      fixed="right"
-      label="操作"
-      width="120">
-      <template slot-scope="scope">
-        <el-button
-          @click.native.prevent="deleteRow(scope.$index, zsglddtableData)"
-          type="text"
-          size="small">
-          移除
-        </el-button>
-      </template>
-    </el-table-column>
-
-                </el-table>
+					  :row-style="{ height: '30px' }"
+					  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+					  :header-cell-style="{ padding: '0px' }"
+					  :show-overflow-tooltip="true"
+					  :cell-class-name="planUsageCellClass"
+					  highlight-current-row="true"
+					  style="width: 100%;height: 30vh" border tooltip-effect="dark" :data="zsglddtableData" row-key="ID">
+				<el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
+				<el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="200"/>
+				<el-table-column align="left" label="生产款号" prop="生产款号"  width="200"/>
+				<el-table-column align="left" label="颜色" prop="颜色"  width="115"/>
+				<el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+				<el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/>
+				<el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
+				<el-table-column align="left" label="款式" prop="款式"  width="115" />
+				
+				  <el-table-column fixed="right" label="操作" width="120">
+				    <template #default="{ row, $index }">
+				      <el-button @click="deleteRow($index)" type="text" size="small">
+				        移除
+				      </el-button>
+				    </template>
+				  </el-table-column>
+				  
+			</el-table>
+				
 		  <!-- 底部操作按钮 -->
 		  <template #footer>
 		    <div class="dialog-footer" style="text-align: right;">
@@ -558,23 +549,21 @@
 		      <el-button type="primary" @click="add_gdenterDialog">确定</el-button>
 		    </div>
 		  </template>
-
+		  
 		</el-dialog>
 
-		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="关联订单面料" style="width: 100%;height: 100%;margin: 0px;" top="2%" destroy-on-close>
-         <!--   <div class="dialog-footer" style="text-align: left;">
-              <el-button @click="Related_fabricscloseDialog">取消</el-button>
-              <el-button type="primary" @click="Related_fabricsenterDialog">确定</el-button>
-            </div>
-			<br> -->
+		<!-- 关联订单面料弹窗 -->
+		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="关联订单面料" 
+		style="width: 70%;height: 80%;" top="2%" destroy-on-close>
 			<el-form>
               <div>
                   <el-space>
-					  <el-button @click="Related_fabricscloseDialog">关闭</el-button>
-					  <el-button type="primary" @click="Related_fabricsenterDialog">确定关联</el-button>
-                    <el-input v-model="glddzl_keyword" style="width: 300px;"  placeholder="请搜索订单编号或款号在进行关联" @input="real_handleInput"/>
+					 
+                    <el-input v-model="glddzl_keyword" style="width: 300px;"  placeholder="请搜索要关联的订单编号或款号进行关联" @input="real_handleInput"/>
                     <el-button type="primary" @click="ddsearchHandle(glddzl_keyword)">搜索</el-button>
-					<span style="color: red;">请选择需要关联复用的颜色物料</span>
+					<!-- <el-button @click="Related_fabricscloseDialog">关闭</el-button> -->
+					<el-button type="primary" @click="Related_fabricsenterDialog">确定关联</el-button>
+					<span style="color: red;">请选择需要关联复用的颜色物料，在确定关联</span>
                   </el-space>
 				  <br>
 				  <br>
@@ -587,23 +576,23 @@
                           highlight-current-row="true"
                           @row-dblclick="bombomupdateCompanyFunc2"
 						  @selection-change="glddSelectionChange"
-                          style="width: 100%;height: 80vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
-                 <el-table-column type="selection" width="40" />
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
-				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="160"/>
-				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="160"/>
-				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
+                          style="width: 100%;height: 65vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
+                 <el-table-column type="selection" width="50" />
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="115"/>
+				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="200"/>
+				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="200"/>
+				  <el-table-column align="left" label="颜色" prop="颜色"  width="115"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="90"/>
-				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="90"/>
-                  <el-table-column align="left" label="款式" prop="款式"  width="110"/>
-				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/>
-				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/>
-				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
-				  <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="110"/>
-				  <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="110"/>
-				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
-				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
+                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/>
+				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
+                  <el-table-column align="left" label="款式" prop="款式"  width="115"/>
+				  <!-- <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/> -->
+				  <!-- <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/> -->
+				  <el-table-column align="left" label="单位" prop="投料单位"  width="115"/>
+				  <!-- <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="110"/> -->
+				  <!-- <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="110"/> -->
+				  <!-- <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/> -->
+				  <!-- <el-table-column align="left" label="备注" prop="备注"  width="180"/> -->
 				  <!-- <el-table-column align="left" label="客户编号" prop="客户编号"  width="100" /> -->
 				  <!-- <el-table-column align="left" label="id" prop="ID"  width="100"/> -->
 				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
@@ -700,7 +689,7 @@
 		
 		
 		<el-dialog v-model="ddzl_dialogFormVisible" :before-close="dd_closeDialog" title="修改订单资料"
-		  width="70%" top="3%" destroy-on-close >
+		  style="height: 100%;width:90%;margin: 0px 0px 0px 6%;" top="0%" destroy-on-close >
 		  <!-- 主布局，分为左右两部分 -->
 		  <el-row>
 		    <!-- 左侧部分，包括第一列和第二列 -->
@@ -802,7 +791,7 @@
 			          type="textarea" id='船样描述'
 		                 @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')"
 			          v-model="edit_ddformData['船样描述']"
-			          rows="2"
+			          rows="1"
 			          resize="none"
 			        />
 			      </el-form-item>
@@ -838,17 +827,17 @@
 		
 		        <!-- 独立的制单信息 -->
 		        <el-form-item label="制单人" label-width="120px">
-		          <el-input v-model="edit_ddformData['Sys_id']" disabled />
+		          <el-input v-model="edit_ddformData['Sys_id']" disabled style="width: 200px;"/>
 		        </el-form-item>
 		
 		        <el-form-item label="制单日期" label-width="120px">
-		          <el-date-picker
-		            v-model="edit_ddformData['Sys_rq']" id='制单日期'
-		            disabled
-		            type="date"
-		          />
+		          <el-date-picker v-model="edit_ddformData['Sys_rq']" id='制单日期' disabled style="width: 200px;" type="date" />
 		        </el-form-item>
 		      </el-form>
+			  <el-button type="primary" @click="edit_Related_fabrics"
+						  style="width: 160px;height: 45px;font-size: 20px; margin-left: 120px;">
+							关联订单面料
+			   </el-button>
 		    </el-col>
 		  </el-row>
 		
@@ -880,18 +869,45 @@
 		      </div>
 			  <div style="flex: 1;">
 				 
-			    <el-form-item label="" class="mab" prop="isBanciSelected" label-width="90">
+			    <!-- <el-form-item label="" class="mab" prop="isBanciSelected" label-width="90">
 			      <el-checkbox 
 			        v-model="edit_ddformData['合并']" 
 			        class="custom-checkbox"
 			      >
 			        <span style="color: red;">需要将订单数据合并请勾选</span>
 			      </el-checkbox>
-			    </el-form-item>
+			    </el-form-item> -->
 			  </div>
 		    </div>
 		  </el-form>
 		</div>
+		<el-tag><span style="font-size: 18px;margin-left: 10px;">关联订单面料明细</span></el-tag>
+		<el-table ref="multipleTable"
+							  :row-style="{ height: '30px' }"
+							  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+							  :header-cell-style="{ padding: '0px' }"
+							  :show-overflow-tooltip="true"
+							  :cell-class-name="planUsageCellClass"
+							  highlight-current-row="true"
+							  style="width: 100%;height: 30vh" border tooltip-effect="dark" :data="edit_zsglddtableData" row-key="ID">
+						<el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
+						<el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="200"/>
+						<el-table-column align="left" label="生产款号" prop="生产款号"  width="200"/>
+						<el-table-column align="left" label="颜色" prop="颜色"  width="115"/>
+						<el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+						<el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/>
+						<el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
+						<el-table-column align="left" label="款式" prop="款式"  width="115" />
+						
+						  <el-table-column fixed="right" label="操作" width="120">
+						    <template #default="{ row, $index }">
+						      <el-button @click="edit_deleteRow($index)" type="text" size="small">
+						        移除
+						      </el-button>
+						    </template>
+						  </el-table-column>
+						  
+					</el-table>
 		  <!-- 底部操作按钮 -->
 		  <template #footer>
 		    <div class="dialog-footer" style="text-align: right;">
@@ -1176,11 +1192,6 @@ export default {
 	   size: '',
 	  add_gddialogFormVisible: true,
     };
-  },
-  methods: {
-	deleteRow(index, rows) {
-        rows.splice(index, 1);
-      }
   }
 };
 </script>
@@ -1190,6 +1201,7 @@ export default {
 import $script from 'scriptjs'
 import $ from 'jquery';
 import LuckyExcel from 'luckyexcel';
+import { toRaw } from 'vue';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus'
 import { ref, reactive, computed, nextTick, watch,onMounted,onBeforeUnmount } from 'vue'
@@ -1720,6 +1732,7 @@ const addgd_onclick = async () => {
     return false;
   }
 	add_gddialogFormVisible.value = true
+	zsglddtableData.value = []
 	//获取订单编号接口
 	const getWorkOrder_list = await getWorkOrder();
 	add_gdscgdformData['订单编号'] = getWorkOrder_list.data;
@@ -1739,6 +1752,15 @@ const addgd_onclick = async () => {
 	// add_gdscgdformData['合并'] = false
 }
 
+//操作移除按钮
+const deleteRow = (index) => {
+	//当前点击索引值
+	console.log(index)
+	console.log(zsglddtableData)
+	//移除当前行
+	zsglddtableData.value.splice(index, 1);
+}
+
 //新增工单资料确定
 const add_gdenterDialog = async ()=>{
 	// 定义需要校验的字段和对应的提示信息
@@ -1750,6 +1772,7 @@ const add_gdenterDialog = async ()=>{
 	  { key: '订单数量', message: '订单数量不能为空' },
 	  { key: '面料', message: '缺少面料信息，无法完成提交，请提供面料数据以便获取BOM资料数据' }
 	];
+	
 	// 遍历每个字段，进行非空或未定义校验
 	for (const field of fields) {
 	  if (!add_gdscgdformData[field.key]) {
@@ -1763,27 +1786,28 @@ const add_gdenterDialog = async ()=>{
 	  return false;
 	}
 	
-  //日期转换
-  let lhrq_formattedDeliveryDate = '';  
-  if (add_gdscgdformData['落货日期']) {  
-    const date = new Date(add_gdscgdformData['落货日期']);  
-    lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`;  
-  }  
+	//日期转换
+	let lhrq_formattedDeliveryDate = '';  
+	if (add_gdscgdformData['落货日期']) {  
+		const date = new Date(add_gdscgdformData['落货日期']);  
+		lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`;  
+	}  
 
-    // 获取 zsglddtableData 中所有行的 UNIQID 和订单编号
+	// 获取 zsglddtableData 中所有行的 UNIQID 和订单编号
 	const ids = zsglddtableData.value.map(item => item.UNIQID);
-  const dds = zsglddtableData.value.map(item => item.订单编号);
+	const dds = zsglddtableData.value.map(item => item.订单编号);
 
-  // 去重
-  const uniqueIds = [...new Set(ids)];
-  const uniqueDds = [...new Set(dds)];
+	//去重UNIQID\订单编号
+	const uniqueIds = [...new Set(ids)];
+	const uniqueDds = [...new Set(dds)];
 
-  // 用逗号连接 UNIQID 和订单编号
-  const formattedIds = uniqueIds.join(',');
-  const formattedDds = uniqueDds.join(',');
+	// 用逗号连接 UNIQID 和订单编号
+	const formattedIds = uniqueIds.join(',');
+	const formattedDds = uniqueDds.join(',');
 
-  console.log("关联订单 UNIQID：", formattedIds);
-  console.log("关联订单编号：", formattedDds);
+	console.log("关联订单编号:", formattedDds);
+	console.log("关联订单UNIQID:", formattedIds);
+  
 	const formattedData = {
 		订单编号: add_gdscgdformData['订单编号'],
 		生产款号: add_gdscgdformData['生产款号'],
@@ -1806,11 +1830,14 @@ const add_gdenterDialog = async ()=>{
 		关联面料ID:formattedIds
 	};
 	console.log(formattedData)
+	// return;
+	//调用新增订单接口
 	const edit_gdformdata_list = await WorkOrderAdd(formattedData);
 	if (edit_gdformdata_list.code === 0) {
 		add_gddialogFormVisible.value = false;
 		ElMessage({type: 'success',message: '新增成功'})
-    const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:1,limit:1});
+		//新增后刷新表格，保证表格显示最新数据
+		const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:1,limit:1});
 		tableData.value=WorkListdata.data.data
 	} else {
 		ElMessage({ type: 'error',message: '新增失败'})
@@ -1822,6 +1849,8 @@ const add_gdcloseDialog = () => {
   add_gddialogFormVisible.value = false
 }
 
+
+
 // =========== 关联订单资料 ===========
 const Related_fabricsVisible = ref(false)
 const glddzl_keyword = ref('')
@@ -1829,6 +1858,7 @@ const glddtableData = reactive([])
 // 关联订单面料按钮
 const Related_fabrics = () => {
 	Related_fabricsVisible.value = true
+	// glddtableData.splice(0, glddtableData.length);//清空表格
 	ddsearchHandle()
 }
 
@@ -1838,19 +1868,29 @@ const real_handleInput = async ()=>{
 	ddsearchHandle()
 }
 
+// 关联订单面料搜索
 const ddsearchHandle = async (v) => {
+	console.log(v)
+	glddtableData.splice(0, glddtableData.length);//清空表格
+	
+	// //判断搜索条件为空
+	// if(v === '' || v === null || v === undefined){
+	// 	return
+	// }
+	
+	//搜索面料库存数据列表接口
 	const response = await fabricList({order:v});
   if (response.data && response.data.length === 0) {
     ElMessage({type: 'warning',message: '未查询到搜索条件'})
   }else{
- // 确保 response.data 和 response.data.table 存在
- if (response?.data?.table) {
+	 // 确保 response.data 和 response.data.table 存在
+	 if (response?.data?.table) {
       glddtableData.value = response.data.table.map(item => ({
         ...item,
         checked: false, // 初始化时默认未勾选
       }));
 	  glddtableData.splice(0, response.data.table.total, ...response.data.table);
-    } else {
+     } else {
       console.error("response.data.table 不存在或为空：", response.data);
     }
   }
@@ -1860,7 +1900,6 @@ const gldd_Selection = ref('')//存储选中Uniqid
 const gldd_Selection_ddbh = ref('')//存储选中订单编号
 const glddSelectionChange = (selection) => {
   console.log("当前选中的数据：", selection);
-
   // 更新 glddtableData 中每一行的 checked 状态
   glddtableData.value = glddtableData.value.map(item => {
     return {
@@ -1868,21 +1907,6 @@ const glddSelectionChange = (selection) => {
       checked: selection.some(selectedItem => selectedItem.UNIQID === item.UNIQID), // 判断是否被勾选
     };
   });
-
-//   // 获取所有行的 UNIQID 和订单编号
-//   const ids = selection.map(item => item.UNIQID);
-//   const dds = selection.map(item => item.订单编号);
-
-//   // 去重
-//   const uniqueIds = [...new Set(ids)];
-//   const uniqueDds = [...new Set(dds)];
-
-//   // 存储选中的 UNIQID 和订单编号
-//   gldd_Selection.value = uniqueIds.join(',');
-//   gldd_Selection_ddbh.value = uniqueDds.join(',');
-
-//   console.log("关联订单复选框", gldd_Selection.value);
-//   console.log("关联订单编号", gldd_Selection_ddbh.value);
 };
 
 //关联订单取消
@@ -1890,21 +1914,26 @@ const Related_fabricscloseDialog = () => {
 	gldd_Selection.value = ''
 	Related_fabricsVisible.value = false
 }
+
 //关联订单确定
 const zsglddtableData = ref([])
 const Related_fabricsenterDialog = () => {
-  // 过滤出勾选的数据
-  const filteredData = glddtableData.value.filter(item => item.checked);
-
-  // 将过滤后的数据添加到 zsglddtableData
-  zsglddtableData.value.push(...filteredData);
+	// 过滤出勾选的数据
+	const filteredData = glddtableData.value.filter(item => item.checked);
+	
+	console.log(filteredData)
+	if(filteredData.length === 0){
+		return
+	}
+	
+	// 将过滤后的数据添加到 zsglddtableData
+	zsglddtableData.value.push(...filteredData);
 
-  // 关闭弹窗
-  Related_fabricsVisible.value = false;
+	// 关闭弹窗
+	Related_fabricsVisible.value = false;
 };
 
 
-
 // =========== 新增颜色资料 ===========
 const add_gdyjdialogFormVisible = ref(false)
 const add_yszlformdata = reactive({
@@ -2626,17 +2655,19 @@ const tableRowClick = async (row) => {
 		bomtableData.value = orderBomListdata.data
 		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
 		
-		const fabricListdata = await fabricList({ order: _Gd_gdbh.value });
-
-		if (fabricListdata.code === 0 && Array.isArray(fabricListdata.data) && fabricListdata.data.length === 0) {
-			// 如果 data 是空数组，表示没有找到相关数据
-			mltableData.splice(0, mltableData.length); // 清空表格数据
-			} else if (fabricListdata.data && Array.isArray(fabricListdata.data)) {
-			// 如果 data 是数组且不为空，更新表格数据
-			mltableData.splice(0, fabricListdata.data.length, ...fabricListdata.data);
-			} else {
-			console.error("接口返回的数据格式不正确：", fabricListdata);
-		}
+		const fabricListdata = await fabricList({ order: _Gd_gdbh.value,});
+		// console.log(fabricListdata)
+		mltableData.splice(0, fabricListdata.data.table.length, ...fabricListdata.data.table);
+		// if (fabricListdata.code === 0 && Array.isArray(fabricListdata.data.table)) {
+		// 	// 如果 data 是空数组，表示没有找到相关数据
+		// 	mltableData.splice(0, mltableData.length); // 清空表格数据
+		// 	} else if (fabricListdata.data.table && Array.isArray(fabricListdata.data.table)) {
+		// 	// 如果 data 是数组且不为空，更新表格数据
+		// 	mltableData.splice(0, fabricListdata.data.table.length, ...fabricListdata.data.table);
+		// 	} else {
+		// 	console.error("接口返回的数据格式不正确：", fabricListdata);
+		// }
+		
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0