优化

src/pinia/modules/user.js

@@ -43,68 +43,20 @@ export const useUserStore = defineStore('user', () => {
   }
 
   
-/* 获取用户信息*/
-const GetUserInfo = async() => {
-	const res = await getUserInfo()
-	if (res.code === 0) {
-	  setUserInfo(res.data.userInfo)
-	}
-	return res
-}
-/* 登录*/
-const LoginIn = async(loginInfo) => {
-	loadingInstance.value = ElLoading.service({
-	  fullscreen: true,
-	  text: '登录中，请稍候...',
-	})
-    try {
-		const res = await login(loginInfo)
-      if (res.code === 0) {
-        setUserInfo(res.data.user)
-        setToken(res.data.token)		
-        const routerStore = useRouterStore()
-        await routerStore.SetAsyncRouter()
-        const asyncRouters = routerStore.asyncRouters
-        asyncRouters.forEach(asyncRouter => {
-          router.addRoute(asyncRouter)
-        })
-        if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
-          ElMessage.error('请联系管理员进行授权')
-        } else {
-          await router.replace({ name: userInfo.value.authority.defaultRouter })
-        }
-
-        loadingInstance.value.close()
-        
-        const isWin = ref(/windows/i.test(navigator.userAgent))
-        if (isWin.value) {
-          window.localStorage.setItem('osType', 'WIN')
-        } else {
-          window.localStorage.setItem('osType', 'MAC')
-        }
-        return true
-      }
-	} catch (e) {
-		loadingInstance.value.close()
-	}
-		loadingInstance.value.close()
-}
-
-
-
-// 定义全局变量
+// 定义全局状态
 const Machine = ref('');  // 机台号
 const MAC = ref('');      // MAC地址
 
-// 封装获取MAC地址的函数
+// 封装MAC地址的函数
 const fetchMACAddress = async () => {
   try {
     const response = await fetch("http://127.0.0.1:8090/init");
+    if (!response.ok) {
+      throw new Error('网络响应不正常: ' + response.status);
+    }
     const res = await response.json();
-
     if (res.macAddress) {
       MAC.value = res.macAddress.match(/.{1,2}/g).join("-");
-      console.log('自动获取物理地址:', MAC.value);
       return MAC.value;
     } else {
       throw new Error('无法获取MAC地址');
@@ -114,17 +66,74 @@ const fetchMACAddress = async () => {
   }
 };
 
-// 获取机器MAC列表，并设置Machine.value
+// 自动获取MAC地址并登录
+const GetAddr = async () => {
+  try {
+    const macAddress = await fetchMACAddress();
+    console.log('GetAddr MAC 地址:', macAddress);
+	
+    // 获取机台号
+    // await getMachineMaclist(macAddress);
+    
+	const response = await getMachineMac({ sys_sbID: macAddress });
+		console.log("获取数据库列表：", response);
+	
+		// if (response.code === 7) {
+		//   return;
+		// }
+	
+	if (!response.data) {
+	  console.log("未能获取响应数据，请检查请求或网络连接。");
+	  return;
+	}
+	
+	if (response.data.sys_sbID === macAddress) {
+	  Machine.value = response.data.机台号;
+	  console.log("获取到的机台号:", Machine.value);
+	} else {
+		Machine.value = 'CF01';
+	  console.log("该电脑未绑定 MAC 地址");
+	}
+	
+    //默认值
+    // if (!Machine.value) {
+    //   Machine.value = 'CF01';
+    //   console.warn("使用默认机台号 CF01");
+    // }
+	let machineId = Machine.value;
+	console.log("当前默认机台号:", machineId);
+	
+	// 如果 `machineId` 格式不正确，进行格式调整
+	machineId = machineId.replace(/([A-Za-z]{2})\d{2}$/, "$101");
+	
+	const loginInfo = {
+	  username: machineId,
+	  password: "123456",
+	  captcha: "443188",
+	  captchaId: "0FZfnUtAOrdXvTETkJRc",
+	  openCaptcha: false,
+	};
+	
+	console.log("准备登录，登录信息:", loginInfo);
+	await LoginIn2(loginInfo);
+    // await proceedWithLogin();
+  } catch (error) {
+    console.error("初始化失败，错误信息:", error.message);
+    handleGlobalError("初始化失败", error);
+  }
+};
+GetAddr();
+
+// 获取机器MAC列表
 const getMachineMaclist = async (macAddress) => {
-  console.log("macAddress：", macAddress);
+  console.log("获取机器MAC列表：", macAddress);
   try {
-    const response = await getMachineMac({ sys_sbID: macAddress });
-    console.log("response：", response);
+		const response = await getMachineMac({ sys_sbID: macAddress });
+		console.log("获取数据库列表：", response);
 
-    if (response.code === 7) {
-      console.log("未登录或非法访问");
-      return;
-    }
+		if (response.code === 7) {
+		  return;
+		}
 
     if (!response.data) {
       console.log("未能获取响应数据，请检查请求或网络连接。");
@@ -142,30 +151,12 @@ const getMachineMaclist = async (macAddress) => {
   }
 };
 
-// 获取MAC地址并格式化
-const GetAddr = async () => {
-  try {
-    const macAddress = await fetchMACAddress();
-    await getMachineMaclist(macAddress);
-
-    // 如果未获取到机台号，使用默认值 CF01
-    if (!Machine.value) {
-      Machine.value = 'CF01';
-      console.warn("未获取到机台号，使用默认机台号 CF01");
-    }
-
-    // 进行登录操作
-    await proceedWithLogin();
-  } catch (error) {
-    handleGlobalError("初始化失败", error);
-  }
-};
-
 // 处理登录逻辑
 const proceedWithLogin = async () => {
   let machineId = Machine.value;
+  console.log("当前默认机台号:", machineId);
 
-  // 将机台号格式化为指定形式
+  // 如果 `machineId` 格式不正确，进行格式调整
   machineId = machineId.replace(/([A-Za-z]{2})\d{2}$/, "$101");
 
   const loginInfo = {
@@ -180,6 +171,7 @@ const proceedWithLogin = async () => {
   await LoginIn2(loginInfo);
 };
 
+
 // 登录处理实现
 const LoginIn2 = async (loginInfo) => {
   let loadingInstance;
@@ -238,20 +230,231 @@ const LoginIn2 = async (loginInfo) => {
       throw new Error('登录失败：' + res.message);
     }
   } catch (error) {
+    console.error("登录时发生错误:", error);
     handleGlobalError("登录时发生错误", error);
   } finally {
     loadingInstance?.close();
   }
 };
 
-// 全局错误处理函数
-const handleGlobalError = (message, error) => {
-  console.error(message, error);
-  ElMessage.error(message);
-};
+/* 获取用户信息*/
+const GetUserInfo = async() => {
+	const res = await getUserInfo()
+	if (res.code === 0) {
+	  setUserInfo(res.data.userInfo)
+	}
+	return res
+}
 
-// 调用GetAddr获取MAC地址和机台号，并进行登录
-GetAddr();
+/* 登录*/
+const LoginIn = async(loginInfo) => {
+	console.log(12312312321321)
+	loadingInstance.value = ElLoading.service({
+	  fullscreen: true,
+	  text: '登录中，请稍候...',
+	})
+    try {
+		const res = await login(loginInfo)
+      if (res.code === 0) {
+        setUserInfo(res.data.user)
+        setToken(res.data.token)		
+        const routerStore = useRouterStore()
+        await routerStore.SetAsyncRouter()
+        const asyncRouters = routerStore.asyncRouters
+        asyncRouters.forEach(asyncRouter => {
+          router.addRoute(asyncRouter)
+        })
+        if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
+          ElMessage.error('请联系管理员进行授权')
+        } else {
+          await router.replace({ name: userInfo.value.authority.defaultRouter })
+        }
+
+        loadingInstance.value.close()
+        
+        const isWin = ref(/windows/i.test(navigator.userAgent))
+        if (isWin.value) {
+          window.localStorage.setItem('osType', 'WIN')
+        } else {
+          window.localStorage.setItem('osType', 'MAC')
+        }
+        return true
+      }
+	} catch (e) {
+		loadingInstance.value.close()
+	}
+		loadingInstance.value.close()
+}
+
+
+
+// // 定义全局变量
+// const Machine = ref('');  // 机台号
+// const MAC = ref('');      // MAC地址
+
+// // 封装获取MAC地址的函数
+// const fetchMACAddress = async () => {
+//   try {
+//     const response = await fetch("http://127.0.0.1:8090/init");
+// 	console.log(response)
+// 	console.log(123)
+// 	console.log(response)
+//     const res = await response.json();
+
+//     if (res.macAddress) {
+//       MAC.value = res.macAddress.match(/.{1,2}/g).join("-");
+//       console.log('自动获取物理地址:', MAC.value);
+//       return MAC.value;
+//     } else {
+// 	  console.log('无法获取MAC地址:', MAC.value);
+//       throw new Error('无法获取MAC地址');
+//     }
+//   } catch (error) {
+//     throw new Error('获取MAC地址失败：' + error.message);
+//   }
+// };
+
+// // 获取机器MAC列表，并设置Machine.value
+// const getMachineMaclist = async (macAddress) => {
+//   console.log("macAddress：", macAddress);
+//   try {
+//     const response = await getMachineMac({ sys_sbID: macAddress });
+//     console.log("response：", response);
+
+//     if (response.code === 7) {
+//       console.log("未登录或非法访问");
+//       return;
+//     }
+
+//     if (!response.data) {
+//       console.log("未能获取响应数据，请检查请求或网络连接。");
+//       return;
+//     }
+
+//     if (response.data.sys_sbID === macAddress) {
+//       Machine.value = response.data.机台号;
+//       console.log("获取到的机台号:", Machine.value);
+//     } else {
+//       console.log("该电脑未绑定 MAC 地址");
+//     }
+//   } catch (error) {
+//     console.error("获取机台号失败：", error.message);
+//   }
+// };
+
+// // 获取MAC地址并格式化
+// const GetAddr = async () => {
+//   try {
+//     const macAddress = await fetchMACAddress();
+// 	console.log(macAddress)
+// 	console.log(123)
+// 	console.log(macAddress)
+//     await getMachineMaclist(macAddress);
+
+//     // 如果未获取到机台号，使用默认值 CF01
+//     if (!Machine.value) {
+//       Machine.value = 'CF01';
+//       console.warn("未获取到机台号，使用默认机台号 CF01");
+//     }
+
+//     // 进行登录操作
+//     await proceedWithLogin();
+//   } catch (error) {
+//     handleGlobalError("初始化失败", error);
+//   }
+// };
+
+// // 处理登录逻辑
+// const proceedWithLogin = async () => {
+//   let machineId = Machine.value;
+
+//   // 将机台号格式化为指定形式
+//   machineId = machineId.replace(/([A-Za-z]{2})\d{2}$/, "$101");
+
+//   const loginInfo = {
+//     username: machineId,
+//     password: "123456",
+//     captcha: "443188",
+//     captchaId: "0FZfnUtAOrdXvTETkJRc",
+//     openCaptcha: false,
+//   };
+
+//   console.log("准备登录，登录信息:", loginInfo);
+//   await LoginIn2(loginInfo);
+// };
+
+// // 登录处理实现
+// const LoginIn2 = async (loginInfo) => {
+//   let loadingInstance;
+//   try {
+//     // 显示加载提示
+//     loadingInstance = ElLoading.service({
+//       fullscreen: true,
+//       text: '登录中，请稍候...',
+//     });
+
+//     const res = await login2(loginInfo);
+
+//     if (res.code === 0) {
+//       console.log("登录成功:", res);
+
+//       // 设置用户信息和Token
+//       setUserInfo(res.data.user);
+//       setToken(res.data.token);
+
+//       // 设置动态路由
+//       const routerStore = useRouterStore();
+//       await routerStore.SetAsyncRouter();
+//       const asyncRouters = routerStore.asyncRouters;
+
+//       for (const asyncRouter of asyncRouters) {
+//         await router.addRoute(asyncRouter);
+//       }
+
+//       // 再次获取MAC并校验
+//       const response = await getMachineMac({ sys_sbID: MAC.value });
+//       if (!response.data) {
+//         ClearStorage();  // 清理本地存储
+//       } else {
+//         const userInfo = res.data.user;
+//         if (!router.hasRoute(userInfo.authority.defaultRouter)) {
+//           ElMessage.error('请联系管理员进行授权');
+//         } else {
+//           await router.replace({ name: userInfo.authority.defaultRouter });
+//         }
+
+//         // 设置系统类型
+//         const isWin = /windows/i.test(navigator.userAgent);
+//         window.localStorage.setItem('osType', isWin ? 'WIN' : 'MAC');
+
+//         // 登录成功后刷新页面，只刷新一次
+//         if (!localStorage.getItem('pageRefreshed')) {
+//           localStorage.setItem('pageRefreshed', 'true');
+//           setTimeout(() => {
+//             location.reload();  // 刷新页面
+//           }, 1000);
+//         }
+
+//         return true;
+//       }
+//     } else {
+//       throw new Error('登录失败：' + res.message);
+//     }
+//   } catch (error) {
+//     handleGlobalError("登录时发生错误", error);
+//   } finally {
+//     loadingInstance?.close();
+//   }
+// };
+
+// // 全局错误处理函数
+// const handleGlobalError = (message, error) => {
+//   console.error(message, error);
+//   ElMessage.error(message);
+// };
+
+// // 调用GetAddr获取MAC地址和机台号，并进行登录
+// GetAddr();
 
 
 

src/view/login/index.vue

@@ -119,7 +119,6 @@
 	
   </div>
 </template>
-
 <script setup>
 import { captcha } from "@/api/user";
 import { checkDB } from "@/api/initdb";
@@ -129,9 +128,6 @@ import { ElMessage } from "element-plus";
 import { useRouter } from "vue-router";
 import { useUserStore } from "@/pinia/modules/user";
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
-
-
-
 defineOptions({
   name: "Login",
 });
@@ -214,23 +210,31 @@ const submitForm = () => {
   });
 };
 
+// const LoginIn2 = reactive({
+// 	username: "CF01",
+// 	password: "123456",
+// 	captcha: "443188",
+// 	captchaId: "0FZfnUtAOrdXvTETkJRc",
+// 	openCaptcha: false,
+// });
+
 // 跳转初始化
-const checkInit = async () => {
-  const res = await checkDB();
-  // console.log("跳转初始化")
-  // console.log(res)
-  if (res.code === 0) {
-    if (res.data?.needInit) {
-      userStore.NeedInit();
-      router.push({ name: "Init" });
-    } else {
-      ElMessage({
-        type: "info",
-        message: "已配置数据库信息，无法初始化",
-      });
-    }
-  }
-};
+// const checkInit = async () => {
+// 	console.log("跳转初始化")
+//   const res = await checkDB();
+//   // console.log(res)
+//   if (res.code === 0) {
+//     if (res.data?.needInit) {
+//       userStore.NeedInit();
+//       router.push({ name: "Init" });
+//     } else {
+//       ElMessage({
+//         type: "info",
+//         message: "已配置数据库信息，无法初始化",
+//       });
+//     }
+//   }
+// };
 
 // userStore.LoginIn2({
 //    username: "",
@@ -282,13 +286,7 @@ const checkInit = async () => {
 //   console.log("通过MAC地址获取机台",response.data.机台号)
 //   Machine.value = response.data.机台号
   
-//   const LoginIn2 = reactive({
-//     username: "username",
-//     password: "123456",
-//     captcha: "443188",
-//     captchaId: "0FZfnUtAOrdXvTETkJRc",
-//     openCaptcha: false,
-//   });
+ 
  
 
 // };

src/view/performance/baozhuangbaogong.vue

@@ -5,52 +5,95 @@
 		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">包装报工</h1>
-				<el-row :gutter="24" style="margin-bottom: 0px;">
-		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
-					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
-					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
-					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
-					</el-form-item>
-		      </el-row>
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<!-- 子订单编号输入框 -->
+					<el-col :span="4"  style="padding: 0px;margin: 0px;">
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
+					</el-col>
+				
+					<!-- 查询按钮 -->
+					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
+					  <el-button type="primary" icon="search" @click="add_onSubmit"style="height: 50px;width: 80px;">查询</el-button>
+					</el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+					  <el-text style="font-size: 30px;">机台号</el-text>
+					</el-col>
+					<!-- 机台号输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['机台号']" readonly style="width: 100%; height: 40px;"/></el-col>
+				   
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">工序</el-text>
+					</el-col>
+					<!-- 工序输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['工序']"  readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">组别</el-text>
+					</el-col>
+					<!-- 组别输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['组别']" readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">人员</el-text>
+					</el-col>
+					<!-- 人员输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
+				</el-row>
+				
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">尺码</el-text>
+					</el-col>
+					<!-- 尺码输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">总数量</el-text>
+					</el-col>
+					<!-- 总数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">剩余数量</el-text>
+					</el-col>
+					<!--剩余数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">上报数量</el-text>
+					</el-col>
+					<!--上报数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+				
+					<!-- 是否尾包文本 -->
+					<el-col :span="2.5">
+					  <el-text style="font-size: 30px;">是否尾包</el-text>
+					</el-col>
+										
+					<!-- 是否尾包按钮 -->
+					<el-col :span="1">
+						<el-button
+							:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"
+							style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
+							 border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"
+							>是</el-button>
+					</el-col>
+					
+					<el-col :span="1">
+						<el-button 
+							:class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"
+							style="margin-top:-6px; height: 50px; width: 60px; margin-left: 10px;
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
+							border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"
+							>否</el-button>
+					</el-col>
+				</el-row>
 				
-				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
-					</el-form-item>
-					<el-form-item label="总数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
-						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
-					</el-form-item>
-					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
-					<!-- 假设 activeButtonValue 是从后端或某个方法获取的，这里直接硬编码为 0 或 1 -->  
-					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
-						 border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
-					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-6px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
-						border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
-					</el-form-item>  
-				</el-row>  
-
 				<layout-content >
 					<el-main>
 						<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">

src/view/performance/caiqiebaogong.vue

@@ -6,75 +6,93 @@
 			<div style="display: flex; align-items: baseline; margin-bottom: 10px;">
 			    <h1 style="margin: 0;">裁切完工报工</h1>
 			</div>
-		      <el-row :gutter="24">
-		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit"id="searchInput" 
-				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
-					<el-form-item label="机台号" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 90px; height: 40px;" id="jitaihao" />
-					</el-form-item>
-					<el-form-item label="工序" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
-					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
-					</el-form-item>
-					<el-form-item label="组别" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
-					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
-					</el-form-item>
-					<el-form-item label="人员" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="73px">
-					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
-					</el-form-item>
+		      <el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+		      	<!-- 子订单编号输入框 -->
+		      	<el-col :span="4"  style="padding: 0px;margin: 0px;">
+		      	  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
+		      	</el-col>
+		      
+		      	<!-- 查询按钮 -->
+		      	<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
+		      	  <el-button type="primary" icon="search" @click="add_onSubmit"style="height: 50px;width: 80px;">查询</el-button>
+		      	</el-col>
+		      
+		      	<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+		      	  <el-text style="font-size: 30px;">机台号</el-text>
+		      	</el-col>
+		      	<!-- 机台号输入框 -->
+		      	<el-col :span="2"><el-input v-model="add_formData['机台号']" readonly style="width: 100%; height: 40px;"/></el-col>
+		         
+		      	<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+		      		<el-text style="font-size: 30px;">工序</el-text>
+		      	</el-col>
+		      	<!-- 工序输入框 -->
+		      	<el-col :span="2"><el-input v-model="add_formData['工序']"  readonly  style="width: 100%; height: 40px;" /></el-col>
+		      
+		      	<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+		      		<el-text style="font-size: 30px;">组别</el-text>
+		      	</el-col>
+		      	<!-- 组别输入框 -->
+		      	<el-col :span="2"><el-input v-model="add_formData['组别']" readonly  style="width: 100%; height: 40px;" /></el-col>
+		      
+		      	<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+		      		<el-text style="font-size: 30px;">人员</el-text>
+		      	</el-col>
+		      	<!-- 人员输入框 -->
+		      	<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
 		      </el-row>
 
-			  <el-row :gutter="24">
-		          <el-form-item label="尺码" class="mab"  prop="keyOrder" label-width="200" style="font-size: 28px;">
-		              <el-input v-model="cmformdata.cm1"  id="cm1"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm2"  id="cm2"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm3"  id="cm3"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm4"  id="cm4"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm5"  id="cm5"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm6"  id="cm6"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm7"  id="cm7"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm8"  id="cm8"  readonly style="width: 70px;height: 40px;"/>
-					        <el-input v-model="cmformdata.cm9"  id="cm9"  readonly style="width: 70px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 70px;height: 40px;"/>
-					        <el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 70px;height: 40px;"/>
-		          </el-form-item>
-		      </el-row>
+					<el-row :gutter="0">
+						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 90px;">尺 码</el-text></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm1" id="cm1" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm2" id="cm2" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm3" id="cm3" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm4" id="cm4" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm5" id="cm5" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm6" id="cm6" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm7" id="cm7" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm8" id="cm8" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm9" id="cm9" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmformdata.cm10" id="cm10" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="cmformdata.cm11" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
+					</el-row>
+					
 
-          <el-row :gutter="24">
-		          <el-form-item label="制单数" class="mab"  prop="keyOrder" label-width="200" style="font-size: 28px;">
-		              <el-input v-model="cmslformdata.cmsl1"  id="cmsl1"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl2"  id="cmsl2"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl3"  id="cmsl3"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl4"  id="cmsl4"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl5"  id="cmsl5"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl6"  id="cmsl6"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl7"  id="cmsl7"  readonly style="width: 70px;height: 40px;"/>
-		              <el-input v-model="cmslformdata.cmsl8"  id="cmsl8"  readonly style="width: 70px;height: 40px;"/>
-					        <el-input v-model="cmslformdata.cmsl9"  id="cmsl9"  readonly style="width: 70px;height: 40px;"/>	
-		              <el-input v-model="cmslformdata.cmsl10" id="cmsl10" readonly style="width: 70px;height: 40px;"/>
-					        <el-input v-model="cmslformdata.zdtotal" id="zdtotal" readonly style="width: 70px;height: 40px;"/>
-		          </el-form-item>
-		      </el-row>
+					<el-row :gutter="0">
+						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 70px;">制单数</el-text></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl1" id="zdsc1" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl2" id="zdsc2" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl3" id="zdsc3" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl4" id="zdsc4" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl5" id="zdsc5" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl6" id="zdsc6" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl7" id="zdsc7" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl8" id="zdsc8" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl9" id="zdsc9" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="cmslformdata.cmsl10" id="zdsc10" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="cmslformdata.zdtotal" id="zdtotal" readonly style="width: 65px;height: 40px;" /></el-col>
+					</el-row>
+					
+					<el-row :gutter="0">
+						<el-col :span="2.5"><el-text style="font-size: 30px;margin-left: 10px;">新增实裁数</el-text></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs1" @input="updateTotal" id="scs1" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs2" @input="updateTotal" id="scs2" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs3" @input="updateTotal" id="scs3" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs4" @input="updateTotal" id="scs4" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs5" @input="updateTotal" id="scs5" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs6" @input="updateTotal" id="scs6" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs7" @input="updateTotal" id="scs7" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs8" @input="updateTotal" id="scs8" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs9" @input="updateTotal" id="scs9" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="scsformdata.scs10" @input="updateTotal" id="scs10" readonly style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1"><el-input v-model="scsformdata.sctotal" id="sctotal" readonly style="width: 65px;height: 40px;" /></el-col>
+						
+						<el-button type="primary" @click="add_Dialog"
+							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 20px">确认</el-button>
+						<el-button type="primary" @click="gd_yulan"
+							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 15px">工单预览</el-button>
+					</el-row>
 		      
-		      <el-row :gutter="24" >
-		          <el-form-item label="新增实裁数" class="mab" prop="keyOrder" label-width="200" style="font-size: 28px;">
-					<el-input  v-model="scsformdata.scs1"  id="scs1"  @input="updateTotal" style="width: 70px;height: 40px;"  @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
-					<el-input  v-model="scsformdata.scs2"  id="scs2"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
-					<el-input  v-model="scsformdata.scs3"  id="scs3"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs2', 'scs3', 'scs4')"/>
-					<el-input  v-model="scsformdata.scs4"  id="scs4"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs3', 'scs4', 'scs5')"/>
-					<el-input  v-model="scsformdata.scs5"  id="scs5"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs4', 'scs5', 'scs6')"/>
-					<el-input  v-model="scsformdata.scs6"  id="scs6"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs5', 'scs6', 'scs7')"/>
-					<el-input  v-model="scsformdata.scs7"  id="scs7"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs6', 'scs7', 'scs8')"/>
-					<el-input  v-model="scsformdata.scs8"  id="scs8"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs7', 'scs8', 'scs9')"/>
-					<el-input  v-model="scsformdata.scs9"  id="scs9"  @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs8', 'scs9', 'scs10')"/>
-					<el-input  v-model="scsformdata.scs10" id="scs10" @input="updateTotal" style="width: 70px;height: 40px;" @keydown="handleKeyDown($event, 'scs9', 'scs10', 'scs1')"/>
-					<el-input  v-model="scsformdata.sctotal" readonly style="width: 70px;height: 40px;" id="sctotal"/>
-          <el-button type="primary" @click="add_Dialog" 	 style="width: 100px;height: 60px;font-size: 20px;margin-left: 10px">确认</el-button>
-          <el-button type="primary" @click="gd_yulan" 	 style="width: 100px;height: 60px;font-size: 20px;">工单预览</el-button>
-		          </el-form-item>
-		      </el-row>
-          
-
 				<el-row :gutter="24" style="margin-bottom: 15px;">
 					<el-table ref="multipleTable" style="width: 100%;height: 52vh" tooltip-effect="dark"
                       :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px', fontSize: '20px' }"

src/view/performance/datangbaogong.vue

@@ -5,51 +5,94 @@
 		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">大烫报工</h1>
-				<el-row :gutter="24" style="margin-bottom: 0px;">
-		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
-					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
-					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
-					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
-					</el-form-item>
-		      </el-row>
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<!-- 子订单编号输入框 -->
+					<el-col :span="4"  style="padding: 0px;margin: 0px;">
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
+					</el-col>
 				
-				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
-					</el-form-item>
-					<el-form-item label="总数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
-						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
-					</el-form-item>
-					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
-					<!-- 假设 activeButtonValue 是从后端或某个方法获取的，这里直接硬编码为 0 或 1 -->  
-					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
-						 border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
-					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-6px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
-						border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
-					</el-form-item>  
-				</el-row>  
+					<!-- 查询按钮 -->
+					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
+					  <el-button type="primary" icon="search" @click="add_onSubmit"style="height: 50px;width: 80px;">查询</el-button>
+					</el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+					  <el-text style="font-size: 30px;">机台号</el-text>
+					</el-col>
+					<!-- 机台号输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['机台号']" readonly style="width: 100%; height: 40px;"/></el-col>
+				   
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">工序</el-text>
+					</el-col>
+					<!-- 工序输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['工序']"  readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">组别</el-text>
+					</el-col>
+					<!-- 组别输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['组别']" readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">人员</el-text>
+					</el-col>
+					<!-- 人员输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
+				</el-row>
+				
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">尺码</el-text>
+					</el-col>
+					<!-- 尺码输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">总数量</el-text>
+					</el-col>
+					<!-- 总数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">剩余数量</el-text>
+					</el-col>
+					<!--剩余数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">上报数量</el-text>
+					</el-col>
+					<!--上报数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+				
+					<!-- 是否尾包文本 -->
+					<el-col :span="2.5">
+					  <el-text style="font-size: 30px;">是否尾包</el-text>
+					</el-col>
+										
+					<!-- 是否尾包按钮 -->
+					<el-col :span="1">
+						<el-button
+							:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"
+							style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
+							 border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"
+							>是</el-button>
+					</el-col>
+					
+					<el-col :span="1">
+						<el-button 
+							:class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"
+							style="margin-top:-6px; height: 50px; width: 60px; margin-left: 10px;
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
+							border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"
+							>否</el-button>
+					</el-col>
+				</el-row>
 
 				<layout-content >
 					<el-main>

src/view/performance/houdaoshougong.vue

@@ -5,51 +5,96 @@
 		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">后道（手工确认）</h1>
-				<el-row :gutter="24" style="margin-bottom: 0px;">
-		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
-					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
-					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
-					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
-					</el-form-item>
-		      </el-row>
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<!-- 子订单编号输入框 -->
+					<el-col :span="4"  style="padding: 0px;margin: 0px;">
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
+					</el-col>
+				
+					<!-- 查询按钮 -->
+					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
+					  <el-button type="primary" icon="search" @click="add_onSubmit"style="height: 50px;width: 80px;">查询</el-button>
+					</el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+					  <el-text style="font-size: 30px;">机台号</el-text>
+					</el-col>
+					<!-- 机台号输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['机台号']" readonly style="width: 100%; height: 40px;"/></el-col>
+				   
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">工序</el-text>
+					</el-col>
+					<!-- 工序输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['工序']"  readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">组别</el-text>
+					</el-col>
+					<!-- 组别输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['组别']" readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">人员</el-text>
+					</el-col>
+					<!-- 人员输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
+				</el-row>
+				
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">尺码</el-text>
+					</el-col>
+					<!-- 尺码输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">总数量</el-text>
+					</el-col>
+					<!-- 总数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">剩余数量</el-text>
+					</el-col>
+					<!--剩余数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">上报数量</el-text>
+					</el-col>
+					<!--上报数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+				
+					<!-- 是否尾包文本 -->
+					<el-col :span="2.5">
+					  <el-text style="font-size: 30px;">是否尾包</el-text>
+					</el-col>
+										
+					<!-- 是否尾包按钮 -->
+					<el-col :span="1">
+						<el-button
+							:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"
+							style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
+							 border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"
+							>是</el-button>
+					</el-col>
+					
+					<el-col :span="1">
+						<el-button 
+							:class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"
+							style="margin-top:-6px; height: 50px; width: 60px; margin-left: 10px;
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
+							border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"
+							>否</el-button>
+					</el-col>
+				</el-row>
+				
 				
-				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
-					</el-form-item>
-					<el-form-item label="总数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
-						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
-					</el-form-item>
-					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
-					<!-- 假设 activeButtonValue 是从后端或某个方法获取的，这里直接硬编码为 0 或 1 -->  
-					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
-						 border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
-					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-6px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
-						border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
-					</el-form-item>  
-				</el-row>  
 
 				<layout-content >
 					<el-main>

src/view/performance/zongjianbaogong.vue

@@ -5,51 +5,94 @@
 		  <!-- <el-main> -->
 			<div class="gva-table-box">
 				<h1 id="title" style="margin: 0%;margin-bottom: 10px;">总检报工</h1>
-				<el-row :gutter="24" style="margin-bottom: 0px;">
-		          <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号" @keyup.enter="add_onSubmit" id="searchInput" 
-				  style="width: 220px;height: 50px;margin-left: 10px;"></el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;width: 80px;">查询</el-button>
-					<el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="116px">
-					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
-					</el-form-item>
-					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
-					</el-form-item>
-					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['组别']" readonly style="width: 140px; height: 40px;" id="zubie" />
-					</el-form-item>
-					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="86px">
-					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
-					</el-form-item>
-		      </el-row>
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<!-- 子订单编号输入框 -->
+					<el-col :span="4"  style="padding: 0px;margin: 0px;">
+					  <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"@keyup.enter="add_onSubmit" id="searchInput" style="width: 100%; height: 50px;"/>
+					</el-col>
 				
-				<el-row :gutter="24">  
-					<el-form-item label="尺码:" prop="chima" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="110">
-						<el-input v-model="add_formData['尺码']" readonly style="width: 70px;height: 40px;" id="chima" />
-					</el-form-item>
-					<el-form-item label="总数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="120">
-						<el-input v-model="add_formData['总数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="剩余数量:" prop="shuliang" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['剩余数量']" readonly style="width: 80px;height: 40px;" id="shuliang" />
-					</el-form-item>
-					<el-form-item label="上报数量:" prop="sbsl" class="mab" style="font-size: 30px;margin: 10px 0px 10px 0px;" label-width="150">
-						<el-input v-model="add_formData['上报数量']" @input="baogongslpd"  style="width: 110px;height: 40px;" id="sbsl" />
-					</el-form-item>
-					<el-form-item label="是否尾包" prop="joinDate" style="font-size: 30px; margin: 10px 0px 10px 0px;" label-width="150">  
-					<!-- 假设 activeButtonValue 是从后端或某个方法获取的，这里直接硬编码为 0 或 1 -->  
-					<div :class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"    
-						style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
-						 border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }">是</div>    
-					<div :class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"    
-						style="margin-top:-6px; height: 50px; width: 60px; 
-						display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
-						border-radius: 4px; color: #000000; font-size: 24px;"    
-						:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }">否</div>
-					</el-form-item>  
-				</el-row>  
+					<!-- 查询按钮 -->
+					<el-col :span="1.5"  style="padding: 0px;margin: 0px;">
+					  <el-button type="primary" icon="search" @click="add_onSubmit"style="height: 50px;width: 80px;">查询</el-button>
+					</el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+					  <el-text style="font-size: 30px;">机台号</el-text>
+					</el-col>
+					<!-- 机台号输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['机台号']" readonly style="width: 100%; height: 40px;"/></el-col>
+				   
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">工序</el-text>
+					</el-col>
+					<!-- 工序输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['工序']"  readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">组别</el-text>
+					</el-col>
+					<!-- 组别输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['组别']" readonly  style="width: 100%; height: 40px;" /></el-col>
+				
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">人员</el-text>
+					</el-col>
+					<!-- 人员输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['人员']" readonly style="width: 100%; height: 40px;"/></el-col>
+				</el-row>
+				
+				<el-row :gutter="10" style="align-items: center; margin-bottom: 20px;">
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">尺码</el-text>
+					</el-col>
+					<!-- 尺码输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['尺码']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">总数量</el-text>
+					</el-col>
+					<!-- 总数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['总数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+					
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">剩余数量</el-text>
+					</el-col>
+					<!--剩余数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['剩余数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+					<el-col :span="1.5" style="padding: 0px;margin: 0px;">
+						<el-text style="font-size: 30px;">上报数量</el-text>
+					</el-col>
+					<!--上报数量输入框 -->
+					<el-col :span="2"><el-input v-model="add_formData['上报数量']" readonly style="width: 100%; height: 40px;"/></el-col>
+						
+				
+					<!-- 是否尾包文本 -->
+					<el-col :span="2.5">
+					  <el-text style="font-size: 30px;">是否尾包</el-text>
+					</el-col>
+										
+					<!-- 是否尾包按钮 -->
+					<el-col :span="1">
+						<el-button
+							:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"
+							style="margin-top:-6px; margin-right:15px; height: 50px; width: 60px; 
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc;
+							 border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"
+							>是</el-button>
+					</el-col>
+					
+					<el-col :span="1">
+						<el-button 
+							:class="{'info-button': activeButtonValue === '0', 'default-button': activeButtonValue !== '0'}"
+							style="margin-top:-6px; height: 50px; width: 60px; margin-left: 10px;
+							display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; 
+							border-radius: 4px; color: #000000; font-size: 24px;"    
+							:style="{ backgroundColor: activeButtonValue === '0' ? '#ff0000' : '#808080' }"
+							>否</el-button>
+					</el-col>
+				</el-row>
 
 				<layout-content >
 					<el-main>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -225,8 +225,8 @@
           
             <el-row class="form-row">
               <el-col :span="20">
-                <el-form-item label="要求" prop="customerCode" class="mab" label-width="110">
-                  <el-input type="textarea" v-model="edit_ddformData['要求']" rows="2" resize="none" id="要求" @keydown="add_gdzlent($event, '面料', '要求', '船样描述')" />
+                <el-form-item label="箱唛要求" prop="customerCode" class="mab" label-width="110">
+                  <el-input type="textarea" v-model="edit_ddformData['箱唛要求']" rows="2" resize="none"id="箱唛要求" @keydown="add_gdzlent($event, '面料', '箱唛要求', '船样描述')" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -234,20 +234,20 @@
             <el-row :gutter="24" class="form-row">
               <el-col :span="10">
                 <el-form-item label="船样描述" prop="customerCode" class="mab" label-width="110">
-                  <el-input v-model="edit_ddformData['船样描述']" style="width: 100%;" id="船样描述" @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')" />
+                  <el-input v-model="edit_ddformData['船样描述']" style="width: 100%;" id="船样描述" @keydown="add_gdzlent($event, '箱唛要求', '船样描述', '船样合计')" />
                 </el-form-item>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="船样合计" prop="customerCode" class="mab" label-width="150">
-                  <el-input v-model="edit_ddformData['船样合计']" style="width: 100%;" id="船样合计" @keydown="add_gdzlent($event, '船样描述', '船样合计', '箱唛要求')" />
+                  <el-input v-model="edit_ddformData['船样合计']" style="width: 100%;" id="船样合计" @keydown="add_gdzlent($event, '船样描述', '船样合计', '备注')" />
                 </el-form-item>
               </el-col>
             </el-row>
           
             <el-row :gutter="24" class="form-row">
               <el-col :span="10">
-                <el-form-item label="箱唛要求" prop="customerCode" class="mab" label-width="110">
-                  <el-input v-model="edit_ddformData['箱唛要求']" style="width: 100%;" id="箱唛要求" @keydown="add_gdzlent($event, '船样合计', '箱唛要求', '粘衬')" />
+                <el-form-item label="备注" prop="customerCode" class="mab" label-width="110">
+                  <el-input v-model="edit_ddformData['要求']" style="width: 100%;" id="备注" @keydown="add_gdzlent($event, '船样合计', '备注', '粘衬')" />
                 </el-form-item>
               </el-col>
               <el-col :span="10">
@@ -433,15 +433,15 @@
 			  <el-row class="form-row">
 			    <el-col :span="20">
 			      <el-form-item label="面料" prop="customerCode" class="mab" label-width="110">
-			        <el-input type="textarea" v-model="add_gdscgdformData['面料']" rows="2" resize="none" id="面料" @keydown="add_gdzlent($event, '落货日期', '面料', '要求')" />
+			        <el-input type="textarea" v-model="add_gdscgdformData['面料']" rows="2" resize="none" id="面料" @keydown="add_gdzlent($event, '落货日期', '面料', '箱唛要求')" />
 			      </el-form-item>
 			    </el-col>
 			  </el-row>
 			            
 			  <el-row class="form-row">
 			    <el-col :span="20">
-			      <el-form-item label="要求" prop="customerCode" class="mab" label-width="110">
-			        <el-input type="textarea" v-model="add_gdscgdformData['要求']" rows="2" resize="none" id="要求" @keydown="add_gdzlent($event, '面料', '要求', '船样描述')" />
+			      <el-form-item label="箱唛要求" prop="customerCode" class="mab" label-width="110">
+			        <el-input type="textarea" v-model="add_gdscgdformData['箱唛要求']" rows="2" resize="none" id="箱唛要求" @keydown="add_gdzlent($event, '面料', '箱唛要求', '船样描述')" />
 			      </el-form-item>
 			    </el-col>
 			  </el-row>
@@ -449,25 +449,25 @@
 			  <el-row :gutter="24" class="form-row">
 			    <el-col :span="10">
 			      <el-form-item label="船样描述" prop="customerCode" class="mab" label-width="110">
-			        <el-input v-model="add_gdscgdformData['船样描述']" style="width: 100%;" id="船样描述" @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')" />
+			        <el-input v-model="add_gdscgdformData['船样描述']" style="width: 100%;" id="船样描述" @keydown="add_gdzlent($event, '箱唛要求', '船样描述', '船样合计')" />
 			      </el-form-item>
 			    </el-col>
 			    <el-col :span="10">
 			      <el-form-item label="船样合计" prop="customerCode" class="mab" label-width="150">
-			        <el-input v-model="add_gdscgdformData['船样合计']" style="width: 100%;" id="船样合计" @keydown="add_gdzlent($event, '船样描述', '船样合计', '箱唛要求')" />
+			        <el-input v-model="add_gdscgdformData['船样合计']" style="width: 100%;" id="船样合计" @keydown="add_gdzlent($event, '船样描述', '船样合计', '备注')" />
 			      </el-form-item>
 			    </el-col>
 			  </el-row>
 			            
 			  <el-row :gutter="24" class="form-row">
 			    <el-col :span="10">
-			      <el-form-item label="箱唛要求" prop="customerCode" class="mab" label-width="110">
-			        <el-input v-model="add_gdscgdformData['箱唛要求']" style="width: 100%;" id="箱唛要求" @keydown="add_gdzlent($event, '船样合计', '箱唛要求', '粘衬')" />
+			      <el-form-item label="备注" prop="customerCode" class="mab" label-width="110">
+			        <el-input v-model="add_gdscgdformData['要求']" style="width: 100%;" id="备注" @keydown="add_gdzlent($event, '船样合计', '备注', '粘衬')" />
 			      </el-form-item>
 			    </el-col>
 			    <el-col :span="10">
 			      <el-form-item label="粘衬" prop="customerCode" class="mab" label-width="150">
-			        <el-input v-model="add_gdscgdformData['粘衬']" style="width: 100%;" id="粘衬" @keydown="add_gdzlent($event, '箱唛要求', '粘衬', '订单数量')" />
+			        <el-input v-model="add_gdscgdformData['粘衬']" style="width: 100%;" id="粘衬" @keydown="add_gdzlent($event, '备注', '粘衬', '订单数量')" />
 			      </el-form-item>
 			    </el-col>
 			  </el-row>
@@ -488,12 +488,12 @@
 			  <el-row :gutter="24" class="form-row">
 			    <el-col :span="10">
 			      <el-form-item label="制单人" prop="customerCode" class="mab" label-width="110">
-			        <el-input v-model="edit_ddformData['Sys_id']" disabled style="width: 100%;" id="制单人" @keydown="add_gdzlent($event, '单位', '制单人', '制单日期')" />
+			        <el-input v-model="add_gdscgdformData['Sys_id']" disabled style="width: 100%;" id="制单人" @keydown="add_gdzlent($event, '单位', '制单人', '制单日期')" />
 			      </el-form-item>
 			    </el-col>
 			    <el-col :span="10">
 			      <el-form-item label="制单日期" prop="deliveryDate" class="mab" label-width="150">
-			        <el-date-picker v-model="edit_ddformData['接单日期']" disabled type="date" style="width: 100%;" id="制单日期" @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')" />
+			        <el-date-picker v-model="add_gdscgdformData['制单日期']" disabled type="date" style="width: 100%;" id="制单日期" @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')" />
 			      </el-form-item>
 			    </el-col>
 			  </el-row>
@@ -1105,6 +1105,8 @@ const gd_clearFormData = () => {
 const add_gddialogFormVisible = ref(false)
 //点击新增订单资料按钮
 const addgd_onclick = async ()=>{
+	console.log("用户信息：",_username.value)
+	
   console.log(_Gd_khdh.value)
   if(_Gd_khdh.value === '' ||  _Gd_khdh.value === null){
 	  ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
@@ -1115,8 +1117,9 @@ const addgd_onclick = async ()=>{
     // console.log(getWorkOrder_list)
     add_gdscgdformData['订单编号'] = getWorkOrder_list.data;
     add_gdscgdformData['客户编号'] = _Gd_khdh.value
-    add_gdscgdformData['制单人'] = _username.value 
-
+    add_gdscgdformData['Sys_id'] = _username.value 
+	add_gdscgdformData['制单日期'] = currentDates
+	
     add_gdscgdformData['生产款号'] = ''
     add_gdscgdformData['款式'] = ''
     add_gdscgdformData['落货日期'] = ''
@@ -1127,10 +1130,6 @@ const addgd_onclick = async ()=>{
     add_gdscgdformData['箱唛要求'] = ''
     add_gdscgdformData['粘衬'] = ''
     add_gdscgdformData['订单数量'] = ''
-    add_gdscgdformData['制单日期'] = currentDates;
-
-
-    
     // add_gdscgdformData['落货日期'] = '2024-07-28';
   }