zck 1 tahun lalu
induk
melakukan
66c97cb5cd

+ 2 - 0
src/view/performance/baozhuangbaogong.vue

@@ -252,6 +252,8 @@ function baogongslpd() {
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
+  }else if(reportedQuantity === 0){
+	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  

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

@@ -56,9 +56,9 @@
 		          </el-form-item>
 		      </el-row>
 		      
-		      <el-row :gutter="24">
+		      <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.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')"/>
@@ -69,7 +69,7 @@
 					<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;">确认</el-button>
+          <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>

+ 17 - 12
src/view/performance/chafengbaogong.vue

@@ -84,16 +84,16 @@
 		      </el-row>
 		      <el-row :gutter="24">
 		          <el-form-item label="上报数量" class="mab" prop="keyOrder" label-width="140" style="font-size: 30px;margin-top: -10px;">
-		              <el-input  v-model="slformdata.sl1" @input="updateTotal" style="width: 65px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
-		              <el-input  v-model="slformdata.sl2" @input="updateTotal" style="width: 65px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
-		              <el-input  v-model="slformdata.sl3" @input="updateTotal" style="width: 65px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
-		              <el-input  v-model="slformdata.sl4" @input="updateTotal" style="width: 65px;height: 40px;" id="sl4"@keydown="handleKeyDown($event, 'sl3', 'sl4', 'sl5')"/>
-		              <el-input  v-model="slformdata.sl5" @input="updateTotal" style="width: 65px;height: 40px;" id="sl5"@keydown="handleKeyDown($event, 'sl4', 'sl5', 'sl6')"/>
-		              <el-input  v-model="slformdata.sl6" @input="updateTotal" style="width: 65px;height: 40px;" id="sl6"@keydown="handleKeyDown($event, 'sl5', 'sl6', 'sl7')"/>
-		              <el-input  v-model="slformdata.sl7" @input="updateTotal" style="width: 65px;height: 40px;" id="sl7"@keydown="handleKeyDown($event, 'sl6', 'sl7', 'sl8')"/>
-		              <el-input  v-model="slformdata.sl8" @input="updateTotal" style="width: 65px;height: 40px;" id="sl8"@keydown="handleKeyDown($event, 'sl7', 'sl8', 'sl9')"/>
-		              <el-input  v-model="slformdata.sl9" @input="updateTotal" style="width: 65px;height: 40px;" id="sl9"@keydown="handleKeyDown($event, 'sl8', 'sl9', 'sl10')"/>
-					  <el-input  v-model="slformdata.sl10" @input="updateTotal" style="width: 65px;height: 40px;" id="sl10"@keydown="handleKeyDown($event, 'sl9', 'sl10', 'sl1')"/>
+		              <el-input  v-model="slformdata.sl1" :readonly="!zdslformdata.cmsl1" @input="updateTotal" style="width: 65px;height: 40px;" id="sl1" @keydown="handleKeyDown($event, 'sl10', 'sl1', 'sl2')"/>
+		              <el-input  v-model="slformdata.sl2" :readonly="!zdslformdata.cmsl2" @input="updateTotal" style="width: 65px;height: 40px;" id="sl2" @keydown="handleKeyDown($event, 'sl1', 'sl2', 'sl3')"/>
+		              <el-input  v-model="slformdata.sl3" :readonly="!zdslformdata.cmsl3" @input="updateTotal" style="width: 65px;height: 40px;" id="sl3"@keydown="handleKeyDown($event, 'sl2', 'sl3', 'sl4')"/>
+		              <el-input  v-model="slformdata.sl4" :readonly="!zdslformdata.cmsl4" @input="updateTotal" style="width: 65px;height: 40px;" id="sl4"@keydown="handleKeyDown($event, 'sl3', 'sl4', 'sl5')"/>
+		              <el-input  v-model="slformdata.sl5" :readonly="!zdslformdata.cmsl5 "@input="updateTotal" style="width: 65px;height: 40px;" id="sl5"@keydown="handleKeyDown($event, 'sl4', 'sl5', 'sl6')"/>
+		              <el-input  v-model="slformdata.sl6" :readonly="!zdslformdata.cmsl6" @input="updateTotal" style="width: 65px;height: 40px;" id="sl6"@keydown="handleKeyDown($event, 'sl5', 'sl6', 'sl7')"/>
+		              <el-input  v-model="slformdata.sl7" :readonly="!zdslformdata.cmsl7" @input="updateTotal" style="width: 65px;height: 40px;" id="sl7"@keydown="handleKeyDown($event, 'sl6', 'sl7', 'sl8')"/>
+		              <el-input  v-model="slformdata.sl8" :readonly="!zdslformdata.cmsl8" @input="updateTotal" style="width: 65px;height: 40px;" id="sl8"@keydown="handleKeyDown($event, 'sl7', 'sl8', 'sl9')"/>
+		              <el-input  v-model="slformdata.sl9" :readonly="!zdslformdata.cmsl9" @input="updateTotal" style="width: 65px;height: 40px;" id="sl9"@keydown="handleKeyDown($event, 'sl8', 'sl9', 'sl10')"/>
+					  <el-input  v-model="slformdata.sl10" :readonly="!zdslformdata.cmsl10" @input="updateTotal" style="width: 65px;height: 40px;" id="sl10"@keydown="handleKeyDown($event, 'sl9', 'sl10', 'sl1')"/>
 					  <el-input  v-model="slformdata.sctotal" readonly style="width: 65px;height: 40px;" id="sctotal"/>
 					  <el-button type="primary" @click="add_Dialog"  style="width: 100px;height: 60px;font-size: 20px;margin: -20px 0 0 10px">确认上报</el-button>
 					  <el-button type="primary" @click="add_printxp" style="width: 100px;height: 60px;font-size: 20px;margin: -20px 0 0 10px">打印预览</el-button>
@@ -104,7 +104,7 @@
 					<div @contextmenu.prevent>
 						<el-table  
 							ref="multipleTableRef"  
-							style="width: 80%; height: 40vh"  
+							style="width:85%; height: 40vh"
 							tooltip-effect="dark"  
 							:row-style="{ height: '40px' }"  
 							:header-cell-style="{ padding: '5px', fontSize: '20px' }"  
@@ -355,6 +355,8 @@ const sizeDatas = reactive([])
 const add_searchInfo = ref('')
 //查询事件
 const add_onSubmit = async ()=>{
+	sizeDatas.length = 0;
+	add_tableData.length = 0;
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
     const WorkListdata = [];
     add_tableData.splice(0,add_tableData.length,...WorkListdata);
@@ -415,6 +417,7 @@ const add_onSubmit = async ()=>{
 		}
   }
 }
+
   
   const AttendanceVisible=ref(false)
   
@@ -438,6 +441,8 @@ const add_onSubmit = async ()=>{
 const currentSlValue = ref('')
 //车缝确认上报按钮
 const add_Dialog = async ()=>{
+	sizeDatas.length = 0;
+	add_tableData.length = 0;
 	console.log(_serial.value)
 	if(_serial.value === NaN){
 		ElMessage({type: 'warning',message: '网络异常.请检查'})
@@ -712,7 +717,7 @@ const add_printxp = () => {
 	let allParams = []; // 用于存储所有要打印的参数对象  
 	let allParamss = ref([]); // 用于存储所有要打印的参数对象
 	if (!slArray.some(item => item !== "" && item !== null && item !== undefined))  {  
-	  ElMessage({type: 'warning', message: '没有填写数量,请填写数量后再使用此功能'});
+	  ElMessage({type: 'warning', message: '请填写上报数量后再使用打印功能'});
 	  return;  
 	}else{
 		let serialNumber = parseInt(_serial.value, 10);

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

@@ -86,6 +86,7 @@ const searcs = ref('')
 
 //表格行点击
 const add_tableRowClick = async (row)=>{
+  add_searchInfo.value = row.子订单编号
 	console.log(row)
 	_orderid.value = row.子订单编号
 }

+ 2 - 0
src/view/performance/datangbaogong.vue

@@ -252,6 +252,8 @@ function baogongslpd() {
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
+  }else if(reportedQuantity === 0){
+	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  

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

@@ -252,6 +252,8 @@ function baogongslpd() {
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
+  }else if(reportedQuantity === 0){
+	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  

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

@@ -252,6 +252,8 @@ function baogongslpd() {
   if (reportedQuantity > totalQuantity) {  
     ElMessage({ type: 'warning', message: '上报数量不能大于剩余数量' });  
     add_Dialogonclick.value = false;  
+  }else if(reportedQuantity === 0){
+	add_Dialogonclick.value = false;  
   } else {  
     add_Dialogonclick.value = true;  
   }  

+ 3 - 1
src/view/yunyin/shengchanguanli/components/print.vue

@@ -34,7 +34,9 @@ const open = (gongdanId) => {
     ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'});
   } else {
     form['gdbh'] = gongdanId;
-    visibie.value = true;
+  cp_print_handleConfirm();
+
+    // visibie.value = true;
   }
     
 }