Merge branch 'master' of ssh://git.7in6.com:11022/dacheng/mes-dacheng-admin-backend-ui

src/view/performance/caiqiebaogong.vue

@@ -29,8 +29,25 @@
 		          </el-form-item>
 		      </el-row>
 		      
-		   <!--   <el-row :gutter="24">
-		          <el-form-item label="制单数合计" class="mab" prop="keyOrder" label-width="200" style="font-size: 30px;margin:5px;">
+
+		      
+		      <el-row :gutter="24">
+		          <el-form-item label="本次实裁新增:" class="mab" prop="keyOrder" label-width="240" style="font-size: 30px;margin: 5px;">
+		              <el-input  v-model="scsformdata.scs1"@input="updateTotal" style="width: 90px;height: 40px;" id="scs1" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
+		              <el-input  v-model="scsformdata.scs2"@input="updateTotal" style="width: 90px;height: 40px;" id="scs2" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
+		              <el-input  v-model="scsformdata.scs3"@input="updateTotal" style="width: 90px;height: 40px;" id="scs3"@keydown="handleKeyDown($event, 'scs2', 'scs3', 'scs4')"/>
+		              <el-input  v-model="scsformdata.scs4"@input="updateTotal" style="width: 90px;height: 40px;" id="scs4"@keydown="handleKeyDown($event, 'scs3', 'scs4', 'scs5')"/>
+		              <el-input  v-model="scsformdata.scs5"@input="updateTotal" style="width: 90px;height: 40px;" id="scs5"@keydown="handleKeyDown($event, 'scs4', 'scs5', 'scs6')"/>
+		              <el-input  v-model="scsformdata.scs6"@input="updateTotal" style="width: 90px;height: 40px;" id="scs6"@keydown="handleKeyDown($event, 'scs5', 'scs6', 'scs7')"/>
+		              <el-input  v-model="scsformdata.scs7"@input="updateTotal" style="width: 90px;height: 40px;" id="scs7"@keydown="handleKeyDown($event, 'scs6', 'scs7', 'scs8')"/>
+		              <el-input  v-model="scsformdata.scs8"@input="updateTotal" style="width: 90px;height: 40px;" id="scs8"@keydown="handleKeyDown($event, 'scs7', 'scs8', 'scs9')"/>
+		              <el-input  v-model="scsformdata.scs9"@input="updateTotal" style="width: 90px;height: 40px;" id="scs9"@keydown="handleKeyDown($event, 'scs8', 'scs9', 'scs10')"/>
+					        <el-input  v-model="scsformdata.scs10"@input="updateTotal" style="width: 90px;height: 40px;" id="scs10"@keydown="handleKeyDown($event, 'scs9', 'scs10', 'scs1')"/>
+					        <el-input  v-model="scsformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
+		          </el-form-item>
+		      </el-row>
+          <!-- <el-row :gutter="24">
+		          <el-form-item label="总的制单数合计/总的实裁数累计:" class="mab" prop="keyOrder" label-width="390" style="font-size: 30px;margin:5px;">
 		              <el-input v-model="zdsformdata.zds1" disabled style="width: 90px;height: 40px;" id="zds1"/>
 		              <el-input v-model="zdsformdata.zds2" disabled style="width: 90px;height: 40px;" id="zds2"/>
 		              <el-input v-model="zdsformdata.zds3" disabled style="width: 90px;height: 40px;" id="zds3"/>
@@ -40,26 +57,10 @@
 		              <el-input v-model="zdsformdata.zds7" disabled style="width: 90px;height: 40px;" id="zds7"/>
 		              <el-input v-model="zdsformdata.zds8" disabled style="width: 90px;height: 40px;" id="zds8"/>
 		              <el-input v-model="zdsformdata.zds9" disabled style="width: 90px;height: 40px;" id="zds9"/>
-					  <el-input v-model="zdsformdata.zds10" disabled style="width: 90px;height: 40px;" id="zds10"/>
-					  <el-input v-model="zdsformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zds11"/>
+					        <el-input v-model="zdsformdata.zds10" disabled style="width: 90px;height: 40px;" id="zds10"/>
+					        <el-input v-model="zdsformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zds11"/>
 		          </el-form-item>
 		      </el-row> -->
-		      
-		      <el-row :gutter="24">
-		          <el-form-item label="本次实裁新增:" class="mab" prop="keyOrder" label-width="240" style="font-size: 30px;margin: 5px;">
-		              <el-input  v-model="scsformdata.scs1" style="width: 90px;height: 40px;" id="scs1" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
-		              <el-input  v-model="scsformdata.scs2" style="width: 90px;height: 40px;" id="scs2" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
-		              <el-input  v-model="scsformdata.scs3" style="width: 90px;height: 40px;" id="scs3"/>
-		              <el-input  v-model="scsformdata.scs4" style="width: 90px;height: 40px;" id="scs4"/>
-		              <el-input  v-model="scsformdata.scs5" style="width: 90px;height: 40px;" id="scs5"/>
-		              <el-input  v-model="scsformdata.scs6" style="width: 90px;height: 40px;" id="scs6"/>
-		              <el-input  v-model="scsformdata.scs7" style="width: 90px;height: 40px;" id="scs7"/>
-		              <el-input  v-model="scsformdata.scs8" style="width: 90px;height: 40px;" id="scs8"/>
-		              <el-input  v-model="scsformdata.scs9" style="width: 90px;height: 40px;" id="scs9"/>
-					  <el-input  v-model="scsformdata.scs10" style="width: 90px;height: 40px;" id="scs10"/>
-					  <el-input  v-model="scsformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
-		          </el-form-item>
-		      </el-row>
 
 				<el-row :gutter="24" style="margin-bottom: 15px;">
 					<el-table ref="multipleTable" style="width: 100%;height: 41vh" tooltip-effect="dark"
@@ -115,7 +116,7 @@ export default {
     };
   }, 
   methods: {
-    handleKeyDown(event, currentId, prevId, nextId) {
+    handleKeyDown(event, prevId, currentId, nextId) {
       const currentElement = document.getElementById(currentId);
       const isEmpty = currentElement.value === '';
       const atStart = currentElement.selectionStart === 0;
@@ -151,6 +152,7 @@ export default {
           break;
       }
     },
+
   },
 };
 </script>
@@ -159,7 +161,7 @@ export default {
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 
 import {ref, reactive} from 'vue'
-import {getSpotList} from '@/api/mes/job'
+import {getSpotList,getInfo} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 defineOptions({name: 'Company'})
 
@@ -199,17 +201,17 @@ const cmformdata = reactive({
 });
 // 制单数
 const zdsformdata = reactive({
-  zds1:'',
-  zds2:'',
-  zds3:'',
-  zds4:'',
-  zds5:'',
-  zds6:'',
-  zds7:'',
-  zds8:'',
-  zds9:'',
-  zds10:'',
-  zdtotal:'',
+  scs1: 0,  
+  scs2: 0,  
+  scs3: 0,  
+  scs4: 0,  
+  scs5: 0,  
+  scs6: 0,  
+  scs7: 0,  
+  scs8: 0,  
+  scs9: 0,  
+  scs10: 0,  
+  sctotal: 0 
 });
 // 实裁数
 const scsformdata = reactive({
@@ -225,6 +227,13 @@ const scsformdata = reactive({
   scs10:'',
   sctotal:'',
 });
+//实采相加
+function updateTotal() {  
+  // 直接指定要累加的属性名  
+  const relevantKeys = ['scs1', 'scs2', 'scs3', 'scs4', 'scs5', 'scs6', 'scs7', 'scs8', 'scs9', 'scs10'];  
+  const values = relevantKeys.map(key => parseInt(scsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
+  scsformdata.sctotal = values.reduce((sum, value) => sum + value, 0);  
+}  
 // const sctotal = async ()=>{
 // 	return [  
 //       scsformdata.scs1,  
@@ -254,19 +263,19 @@ const add_onSubmit = async ()=>{
 	console.log(getSpotLists)
 	add_tableData.value = getSpotLists.data.data;
 
-	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10',];
-	const keys2 = ['zds1', 'zds2', 'zds3', 'zds4','zds5','zds6','zds7','zds8','zds9','zds10','zdtotal',];
+	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10','cm11',];
+	// const keys2 = ['zds1', 'zds2', 'zds3', 'zds4','zds5','zds6','zds7','zds8','zds9','zds10','zdtotal',];
 	if(order.includes('-')){
 		for (let key of keys1) {  
 			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
 				cmformdata[key] = getSpotLists.data.list[0][key];  
 			}  
 		}  
-		for (let key of keys2) {  
-			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
-				zdsformdata[key] = getSpotLists.data.list[0][key];  
-			}  
-		}  
+		// for (let key of keys2) {  
+		// 	if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
+		// 		zdsformdata[key] = getSpotLists.data.list[0][key];  
+		// 	}  
+		// }  
 		setTimeout(() => {
         const inputElement = document.getElementById('scs1');
         if (inputElement) {
@@ -318,15 +327,15 @@ const add_Dialog = async ()=>{
 	    params.rq = currentDates;//时间
 	    console.log(params)
 	    //裁切完工报工
-	    // const baogong_getInfo = await getInfo(params);
-	    // if (baogong_getInfo.code === 0) {
-	    //   ElMessage({type: 'success',message: '报工成功'});
-	    //     const getSpotToLists = await getSpotToList();
-	    //     add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);
-	    //     add_searchInfo.value = ''
-	    // } else {
-	    //   ElMessage({ type: 'error',message: '出库失败'})
-	    // }
+	    const baogong_getInfo = await getInfo(params);
+	    if (baogong_getInfo.code === 0) {
+	      ElMessage({type: 'success',message: '报工成功'});
+	        const getSpotToLists = await getSpotToList();
+	        add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);
+	        add_searchInfo.value = ''
+	    } else {
+	      ElMessage({ type: 'error',message: '出库失败'})
+	    }
 	} else {
 		ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
 	}