zck 1 năm trước cách đây
mục cha
commit
74d5b6f10f

+ 3 - 1
src/view/login/index.vue

@@ -14,7 +14,9 @@
           <div>
             <!--LOGO-->
             <div class="flex items-center justify-center" style="height:100px;width: 100px;margin-left: 110px;" >
-              <img class="w-48 h-16" :src="`/src/assets/dacheng.jpg`" alt />
+              <!-- <img class="w-48 h-16" :src="`/src/assets/dacheng.jpg`" alt /> -->
+              <img class="w-48 h-16" :src="`https://www.reachingkayo.com/Uploads/62f88d57efb9d749.jpg`" alt />
+              
             </div>
             <div class="mb-9">
               <p class="text-center text-3xl font-bold">

+ 1 - 1
src/view/performance/baozhuangbaogong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">包装报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号二维码获取" 
+					<el-input v-model="add_searchInfo" placeholder="扫描标签二维码" 
 								  @keyup.enter="add_onSubmit"
 								id="searchInput" 
 								  style="width: 230px;margin: 5px;height: 50px;">

+ 1 - 1
src/view/performance/caiqiebaogong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
 		      <el-row :gutter="24" style="margin-bottom: 20px;">
-		          <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
+		          <el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
 							  id="searchInput" 
 			  				  style="width: 270px;margin: 5px;height: 50px;">

+ 10 - 8
src/view/performance/chafengbaogong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">车缝完工报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号二维码获取" 
+					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号获取订单信息" 
 								  @keyup.enter="add_onSubmit"
 								id="searchInput" 
 								  style="width: 230px;margin: 5px;height: 50px;">
@@ -478,14 +478,15 @@ const confirmDialogVisible = () => {
   };
     // 打印小票
 	const add_printxp = () => {
-	  if (1 === 0) {  
-		  alert('没有选中要打印的数据');  
+		let cmArray = [cmformdata.cm1, cmformdata.cm2,cmformdata.cm3,cmformdata.cm4,cmformdata.cm5,cmformdata.cm6,cmformdata.cm7,cmformdata.cm8,cmformdata.cm9,cmformdata.cm10,];
+		let slArray = [slformdata.sl1, slformdata.sl2,slformdata.sl3,slformdata.sl4,slformdata.sl5,slformdata.sl6,slformdata.sl7,slformdata.sl8,slformdata.sl9,slformdata.sl10,]; 
+		let allParams = []; // 用于存储所有要打印的参数对象  
+		let allParamss = ref([]); // 用于存储所有要打印的参数对象
+		console.log(slArray)
+		if (!slArray.some(item => item !== "" && item !== null && item !== undefined))  {  
+		  alert('没有填写数量,请填写数量后再使用此功能');  
 		  return;  
 	  }else{
-			let cmArray = [cmformdata.cm1, cmformdata.cm2,cmformdata.cm3,cmformdata.cm4,cmformdata.cm5,cmformdata.cm6,cmformdata.cm7,cmformdata.cm8,cmformdata.cm9,cmformdata.cm10,];
-			let slArray = [slformdata.sl1, slformdata.sl2,slformdata.sl3,slformdata.sl4,slformdata.sl5,slformdata.sl6,slformdata.sl7,slformdata.sl8,slformdata.sl9,slformdata.sl10,]; 
-			let allParams = []; // 用于存储所有要打印的参数对象  
-			let allParamss = ref([]); // 用于存储所有要打印的参数对象  
 			for (let i = 0; i <  slArray.length; i++) {  
 				if (slArray[i]) { 
 					let params = {};  
@@ -503,7 +504,8 @@ const confirmDialogVisible = () => {
 					allParamss.value = allParams.map((row) => {
 						console.log(allParamss)
 					let weibao = row['wb'] === '是' ? 1 : 0;
-					const ewm = `${row['order_id']},01,${row['cm']},${row['sl']},${weibao}`;
+					//二维码数据:订单子编号,组别,工序(固定),尺码,数量,是否尾包(1代表是0代表否)如2408001-1,CF01,3,10,20,0
+					const ewm = `${row['order_id']},${add_formData['机台号']},3,${row['cm']},${row['sl']},${weibao}`;
 					console.log(123)
 					console.log(_yskskh._value['款号'])
 					return {

+ 1 - 1
src/view/performance/chukubaogong.vue

@@ -4,7 +4,7 @@
       <layout-header>
         <div class="">
           <h1 style="margin: 0%;margin-bottom: 10px;">出库报工</h1>
-          <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
+          <el-input v-model="add_searchInfo" placeholder="扫描订单编号获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
 							  id="searchInput" 
 			  				  style="width: 270px;margin: 5px;height: 50px;">

+ 1 - 1
src/view/performance/datangbaogong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">大烫报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号二维码获取" 
+					<el-input v-model="add_searchInfo" placeholder="扫描标签二维码" 
 								  @keyup.enter="add_onSubmit"
 								id="searchInput" 
 								  style="width: 230px;margin: 5px;height: 50px;">

+ 2 - 48
src/view/performance/houdaoshougong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">后道(手工确认)</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号二维码获取" 
+					<el-input v-model="add_searchInfo" placeholder="扫描标签二维码" 
 								  @keyup.enter="add_onSubmit"
 								id="searchInput" 
 								  style="width: 230px;margin: 5px;height: 50px;">
@@ -53,53 +53,7 @@
 					</el-form-item>  
 				</el-row>  
 					
-				  <!-- <el-row :gutter="24">
-		          <el-form-item label="尺码" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm3" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm4" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm5" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm6" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm7" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm8" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm10" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm11" disabled style="width: 90px;height: 40px;"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="制单数/实裁量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="zdscformdata.zdsc1" disabled style="width: 90px;height: 40px;" id="zdsc1"/>
-		              <el-input v-model="zdscformdata.zdsc2" disabled style="width: 90px;height: 40px;" id="zdsc2"/>
-		              <el-input v-model="zdscformdata.zdsc3" disabled style="width: 90px;height: 40px;" id="zdsc3"/>
-		              <el-input v-model="zdscformdata.zdsc4" disabled style="width: 90px;height: 40px;" id="zdsc4"/>
-		              <el-input v-model="zdscformdata.zdsc5" disabled style="width: 90px;height: 40px;" id="zdsc5"/>
-		              <el-input v-model="zdscformdata.zdsc6" disabled style="width: 90px;height: 40px;" id="zdsc6"/>
-		              <el-input v-model="zdscformdata.zdsc7" disabled style="width: 90px;height: 40px;" id="zdsc7"/>
-		              <el-input v-model="zdscformdata.zdsc8" disabled style="width: 90px;height: 40px;" id="zdsc8"/>
-		              <el-input v-model="zdscformdata.zdsc9" disabled style="width: 90px;height: 40px;" id="zdsc9"/>
-					  <el-input v-model="zdscformdata.zdsc10" disabled style="width: 90px;height: 40px;" id="zdsc10"/>
-					  <el-input v-model="zdscformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zdsc11"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="数量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input  v-model="slformdata.sl1" style="width: 90px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
-		              <el-input  v-model="slformdata.sl2" style="width: 90px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
-		              <el-input  v-model="slformdata.sl3" style="width: 90px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
-		              <el-input  v-model="slformdata.sl4" style="width: 90px;height: 40px;" id="sl4"@keydown="handleKeyDown($event, 'sl3', 'sl4', 'sl5')"/>
-		              <el-input  v-model="slformdata.sl5" style="width: 90px;height: 40px;" id="sl5"@keydown="handleKeyDown($event, 'sl4', 'sl5', 'sl6')"/>
-		              <el-input  v-model="slformdata.sl6" style="width: 90px;height: 40px;" id="sl6"@keydown="handleKeyDown($event, 'sl5', 'sl6', 'sl7')"/>
-		              <el-input  v-model="slformdata.sl7" style="width: 90px;height: 40px;" id="sl7"@keydown="handleKeyDown($event, 'sl6', 'sl7', 'sl8')"/>
-		              <el-input  v-model="slformdata.sl8" style="width: 90px;height: 40px;" id="sl8"@keydown="handleKeyDown($event, 'sl7', 'sl8', 'sl9')"/>
-		              <el-input  v-model="slformdata.sl9" style="width: 90px;height: 40px;" id="sl9"@keydown="handleKeyDown($event, 'sl8', 'sl9', 'sl10')"/>
-					  <el-input  v-model="slformdata.sl10" style="width: 90px;height: 40px;" id="sl10"@keydown="handleKeyDown($event, 'sl9', 'sl10', 'sl1')"/>
-					  <el-input  v-model="slformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
-		          </el-form-item>
-		      </el-row> -->
+
 
 				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
 					<div @contextmenu.prevent>

+ 2 - 48
src/view/performance/zongjianbaogong.vue

@@ -6,7 +6,7 @@
 			<div class="gva-table-box">
 				<h1 style="margin: 0%;margin-bottom: 10px;">总检报工</h1>
 				<el-row :gutter="24" style="margin-bottom: 15px;">
-					<el-input v-model="add_searchInfo" placeholder="扫描订单子编号二维码获取" 
+					<el-input v-model="add_searchInfo" placeholder="扫描标签二维码" 
 								  @keyup.enter="add_onSubmit"
 								id="searchInput" 
 								  style="width: 230px;margin: 5px;height: 50px;">
@@ -53,53 +53,7 @@
 					</el-form-item>  
 				</el-row>  
 					
-				  <!-- <el-row :gutter="24">
-		          <el-form-item label="尺码" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm3" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm4" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm5" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm6" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm7" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm8" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>	
-		              <el-input v-model="cmformdata.cm10" disabled style="width: 90px;height: 40px;"/>
-					  <el-input v-model="cmformdata.cm11" disabled style="width: 90px;height: 40px;"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="制单数/实裁量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="zdscformdata.zdsc1" disabled style="width: 90px;height: 40px;" id="zdsc1"/>
-		              <el-input v-model="zdscformdata.zdsc2" disabled style="width: 90px;height: 40px;" id="zdsc2"/>
-		              <el-input v-model="zdscformdata.zdsc3" disabled style="width: 90px;height: 40px;" id="zdsc3"/>
-		              <el-input v-model="zdscformdata.zdsc4" disabled style="width: 90px;height: 40px;" id="zdsc4"/>
-		              <el-input v-model="zdscformdata.zdsc5" disabled style="width: 90px;height: 40px;" id="zdsc5"/>
-		              <el-input v-model="zdscformdata.zdsc6" disabled style="width: 90px;height: 40px;" id="zdsc6"/>
-		              <el-input v-model="zdscformdata.zdsc7" disabled style="width: 90px;height: 40px;" id="zdsc7"/>
-		              <el-input v-model="zdscformdata.zdsc8" disabled style="width: 90px;height: 40px;" id="zdsc8"/>
-		              <el-input v-model="zdscformdata.zdsc9" disabled style="width: 90px;height: 40px;" id="zdsc9"/>
-					  <el-input v-model="zdscformdata.zdsc10" disabled style="width: 90px;height: 40px;" id="zdsc10"/>
-					  <el-input v-model="zdscformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zdsc11"/>
-		          </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="数量" class="mab" prop="keyOrder" label-width="220" style="font-size: 30px;margin: 10px;">
-		              <el-input  v-model="slformdata.sl1" style="width: 90px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
-		              <el-input  v-model="slformdata.sl2" style="width: 90px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
-		              <el-input  v-model="slformdata.sl3" style="width: 90px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
-		              <el-input  v-model="slformdata.sl4" style="width: 90px;height: 40px;" id="sl4"@keydown="handleKeyDown($event, 'sl3', 'sl4', 'sl5')"/>
-		              <el-input  v-model="slformdata.sl5" style="width: 90px;height: 40px;" id="sl5"@keydown="handleKeyDown($event, 'sl4', 'sl5', 'sl6')"/>
-		              <el-input  v-model="slformdata.sl6" style="width: 90px;height: 40px;" id="sl6"@keydown="handleKeyDown($event, 'sl5', 'sl6', 'sl7')"/>
-		              <el-input  v-model="slformdata.sl7" style="width: 90px;height: 40px;" id="sl7"@keydown="handleKeyDown($event, 'sl6', 'sl7', 'sl8')"/>
-		              <el-input  v-model="slformdata.sl8" style="width: 90px;height: 40px;" id="sl8"@keydown="handleKeyDown($event, 'sl7', 'sl8', 'sl9')"/>
-		              <el-input  v-model="slformdata.sl9" style="width: 90px;height: 40px;" id="sl9"@keydown="handleKeyDown($event, 'sl8', 'sl9', 'sl10')"/>
-					  <el-input  v-model="slformdata.sl10" style="width: 90px;height: 40px;" id="sl10"@keydown="handleKeyDown($event, 'sl9', 'sl10', 'sl1')"/>
-					  <el-input  v-model="slformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
-		          </el-form-item>
-		      </el-row> -->
+
 
 				<el-row :gutter="24" style="margin-bottom: 15px;margin-left: 0px;">
 					<div @contextmenu.prevent>