zck 1 年之前
父节点
当前提交
655d769075

+ 9 - 8
src/view/performance/baozhuangbaogong.vue

@@ -25,20 +25,21 @@
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
+
+				</el-row>
+				
+				<el-row :gutter="24">  
 					<el-form-item label="数量:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['数量']" style="width: 110px;height: 40px;" id="数量" />
 					</el-form-item>
 					<el-form-item label="尺码:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['尺码']" style="width: 110px;height: 40px;" id="尺码" />
 					</el-form-item>
-				</el-row>
-				
-				<el-row :gutter="24">  
 					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div  
 						:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"  
-						style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
+						style="margin-top:-20px;margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"  
 					>  
@@ -161,11 +162,11 @@ const currentDates = `${year}-${month}-${day}`;
 const getMachineMacdata = async () => {
   try {
 	const Machine = '68-ED-A4-26-5F-38'
-    const data  = await getMachineMac({sys_sbID:Machine});
+    const data  = await getMachineMac({sys_sbID:Machine,code:'包装'});
 	add_formData['机台号'] = data.data['机台号']
-	add_formData['工序'] = data.data['工序']
+	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
-	add_formData['人员'] = 'xxx'
+	add_formData['人员'] = data.data['组长']
   } catch (error) {
     console.error(error)
   }
@@ -188,7 +189,7 @@ const add_onSubmit = async ()=>{
   }else{
     const order =add_searchInfo.value;
 	const sys_sbID = add_formData['机台号']
-	const getSpotLists = await getSpotList({order:order,code:'包装',sys_sbID:sys_sbID});
+	const getSpotLists = await getSpotList({order:order,code:'包装',sys_sbID:sys_sbID,code:'包装'});
 	activeButtonValue.value = getSpotLists.data.result.wb
     UniqId.value = getSpotLists.data.result.UniqId
 	add_formData['数量'] = getSpotLists.data.result.sl

+ 3 - 3
src/view/performance/chafengbaogong.vue

@@ -198,11 +198,11 @@ const currentDates = `${year}-${month}-${day}`;
 const getMachineMacdata = async () => {
   try {
 	const Machine = '68-ED-A4-26-60-84'
-    const data  = await getMachineMac({sys_sbID:Machine});
+    const data  = await getMachineMac({sys_sbID:Machine,code:'车缝'});
 	add_formData['机台号'] = data.data['机台号']
-	add_formData['工序'] = data.data['工序']
+	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
-	add_formData['人员'] = 'xxx'
+	add_formData['人员'] = data.data['组长']
   } catch (error) {
     console.error(error)
   }

+ 8 - 7
src/view/performance/datangbaogong.vue

@@ -25,20 +25,21 @@
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
+
+				</el-row>
+				
+				<el-row :gutter="24">  
 					<el-form-item label="数量:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['数量']" style="width: 110px;height: 40px;" id="数量" />
 					</el-form-item>
 					<el-form-item label="尺码:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['尺码']" style="width: 110px;height: 40px;" id="尺码" />
 					</el-form-item>
-				</el-row>
-				
-				<el-row :gutter="24">  
 					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div  
 						:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"  
-						style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
+						style="margin-top:-20px;margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"  
 					>  
@@ -160,11 +161,11 @@ const currentDates = `${year}-${month}-${day}`;
 const getMachineMacdata = async () => {
   try {
 	const Machine = '68-ED-A4-16-7F-36'
-    const data  = await getMachineMac({sys_sbID:Machine});
+    const data  = await getMachineMac({sys_sbID:Machine,code:'大烫'});
 	add_formData['机台号'] = data.data['机台号']
-	add_formData['工序'] = data.data['工序']
+	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
-	add_formData['人员'] = 'xxx'
+	add_formData['人员'] = data.data['组长']
   } catch (error) {
     console.error(error)
   }

+ 8 - 7
src/view/performance/houdaoshougong.vue

@@ -25,20 +25,21 @@
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
+
+				</el-row>
+				
+				<el-row :gutter="24">  
 					<el-form-item label="数量:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['数量']" style="width: 110px;height: 40px;" id="数量" />
 					</el-form-item>
 					<el-form-item label="尺码:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['尺码']" style="width: 110px;height: 40px;" id="尺码" />
 					</el-form-item>
-				</el-row>
-				
-				<el-row :gutter="24">  
 					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div  
 						:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"  
-						style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
+						style="margin-top:-20px; margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"  
 					>  
@@ -162,11 +163,11 @@ const currentDates = `${year}-${month}-${day}`;
 const getMachineMacdata = async () => {
   try {
 	const Machine = '68-ED-A4-26-60-D1'
-    const data  = await getMachineMac({sys_sbID:Machine});
+    const data  = await getMachineMac({sys_sbID:Machine,code:'后道'});
 	add_formData['机台号'] = data.data['机台号']
-	add_formData['工序'] = data.data['工序']
+	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
-	add_formData['人员'] = 'xxx'
+	add_formData['人员'] = data.data['组长']
   } catch (error) {
     console.error(error)
   }

+ 8 - 7
src/view/performance/zongjianbaogong.vue

@@ -25,20 +25,21 @@
 					<el-form-item label="人员:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['人员']" style="width: 110px;height: 40px;" id="人员" />
 					</el-form-item>
+
+				</el-row>
+				
+				<el-row :gutter="24">  
 					<el-form-item label="数量:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['数量']" style="width: 110px;height: 40px;" id="数量" />
 					</el-form-item>
 					<el-form-item label="尺码:" prop="deliveryDate" class="mab" style="font-size: 30px;margin: 10px;" label-width="90">
 						<el-input v-model="add_formData['尺码']" style="width: 110px;height: 40px;" id="尺码" />
 					</el-form-item>
-				</el-row>
-				
-				<el-row :gutter="24">  
 					<el-form-item label="是否尾包:" prop="joinDate" style="font-size: 30px; margin: 10px;" label-width="150">  
 					<!-- 假设 activeButtonValue 是从后端或某个方法获取的,这里直接硬编码为 0 或 1 -->  
 					<div  
 						:class="{'info-button': activeButtonValue === '1', 'default-button': activeButtonValue !== '1'}"  
-						style="margin-top:-20px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
+						style="margin-top:-20px;margin-right:15px; height: 50px; width: 70px; display: flex; justify-content: center; align-items: center; cursor: not-allowed; border: 1px solid #ccc; border-radius: 4px; color: #000000;"  
 						:style="{ backgroundColor: activeButtonValue === '1' ? '#ff0000' : '#808080' }"  
 					>  
@@ -162,11 +163,11 @@ const currentDates = `${year}-${month}-${day}`;
 const getMachineMacdata = async () => {
   try {
 	const Machine = '68-ED-A4-26-5F-84'
-    const data  = await getMachineMac({sys_sbID:Machine});
+    const data  = await getMachineMac({sys_sbID:Machine,code:'总检'});
 	add_formData['机台号'] = data.data['机台号']
-	add_formData['工序'] = data.data['工序']
+	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']
-	add_formData['人员'] = 'xxx'
+	add_formData['人员'] = data.data['组长']
   } catch (error) {
     console.error(error)
   }