From 0892a7ff70f106f7cfa9747ad14cb5308cd03187 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 11 四月 2024 17:23:21 +0800
Subject: [PATCH] 根据回数和片数判断计算当前正在输入的是表格的哪一行哪一列表格的当前单元格蓝边框其他表格边框置灰逻辑
---
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 141 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 59 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index adce78a..8ecc54c 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -357,6 +357,7 @@
style="width: 100%"
border
:height="'calc(100% - 0px)'"
+ :cell-style='cellStyle'
>
<el-table-column
prop="carNumber"
@@ -468,7 +469,7 @@
align="center"
>
<template slot-scope="scope">
- {{getPeopleYield(scope.row)}}
+ {{scope.row.peopleYield}}
</template>
</el-table-column>
<el-table-column
@@ -682,40 +683,41 @@
string=Number(row.pieceNumber11)
}
if(row.pieceNumber12){
- string=string+Number(row.pieceNumber12)
+ string=Number(string)+Number(row.pieceNumber12)
}
if(row.pieceNumber13){
- string=string+Number(row.pieceNumber13)
+ string=Number(string)+Number(row.pieceNumber13)
}
if(row.pieceNumber14){
- string=string+Number(row.pieceNumber14)
+ string=Number(string)+Number(row.pieceNumber14)
}
if(row.pieceNumber21){
- string=string+Number(row.pieceNumber21)
+ string=Number(string)+Number(row.pieceNumber21)
}
if(row.pieceNumber22){
- string=string+Number(row.pieceNumber22)
+ string=Number(string)+Number(row.pieceNumber22)
}
if(row.pieceNumber23){
- string=string+Number(row.pieceNumber23)
+ string=Number(string)+Number(row.pieceNumber23)
}
if(row.pieceNumber24){
- string=string+Number(row.pieceNumber24)
+ string=Number(string)+Number(row.pieceNumber24)
}
if(row.pieceNumber31){
- string=string+Number(row.pieceNumber31)
+ string=Number(string)+Number(row.pieceNumber31)
}
if(row.pieceNumber32){
- string=string+Number(row.pieceNumber32)
+ string=Number(string)+Number(row.pieceNumber32)
}
if(row.pieceNumber33){
- string=string+Number(row.pieceNumber33)
+ string=Number(string)+Number(row.pieceNumber33)
}
if(row.pieceNumber34){
- string=string+Number(row.pieceNumber34)
+ string=Number(string)+Number(row.pieceNumber34)
}
}
- row.oneYield=string;
+ this.getPeopleYield(row)
+ row.oneYield=Number(string);
return string;
},
getPeopleYield(row){
@@ -728,13 +730,10 @@
if(row.perList[j]==this.tableData[i].carNumber){
string=string+this.tableData[i].oneYield
}
- if(j==row.perList.length-1){
- break;
- }
}
}
for(let k in this.tableData){
- if(this.tableData[k ].carNumber==carNumber){
+ if(this.tableData[k].carNumber==carNumber){
this.$set(this.tableData[k],'peopleYield',string)
break;
}
@@ -749,16 +748,16 @@
string=Number(row['pieceNumber'+val+'1'])
}
if(row['pieceNumber'+val+'2']){
- string=string+Number(row['pieceNumber'+val+'2'])
+ string=Number(string)+Number(row['pieceNumber'+val+'2'])
}
if(row['pieceNumber'+val+'3']){
- string=string+Number(row['pieceNumber'+val+'3'])
+ string=Number(string)+Number(row['pieceNumber'+val+'3'])
}
if(row['pieceNumber'+val+'4']){
- string=string+Number(row['pieceNumber'+val+'4'])
+ string=Number(string)+Number(row['pieceNumber'+val+'4'])
}
}
- row['allYield'+val]=string;
+ row['allYield'+val]=Number(string);
return string;
},
changeForm(form,val){
@@ -770,31 +769,53 @@
this.getGroupNumber()
}
},
+ cellStyle({row,columnIndex}){
+ let cellStyle;
+ if(row.isBlue){
+ let pieceNumber=this.$refs.addProductDialog.proForm.pieceNumber||1
+ let pieces=this.$refs.addProductDialog.proForm.pieces||1
+ let number=(Number(pieceNumber)-1)*4+Number(pieces)
+ if(columnIndex==number){
+ cellStyle='borderColor:#2a78fb;borderTop:1px solid #2a78fb;borderLeft:1px solid #2a78fb;'
+ }
+ }else{
+ cellStyle='borderColor:#EBEEF5;borderTop:0;borderLeft:0'
+ }
+ return cellStyle;
+ },
changeTableInput(form){
let string=''
for(let i in this.tableData){
if(this.tableData[i].carNumber==form.carNumber){
string=i
- if(Number(form.pieceNumber)>0&&Number(form.pieces)<5){
+ if(Number(form.pieceNumber)>0&&Number(form.pieces)<5){
+ this.tableData.map((item) => {
+ item.isBlue=false
+ })
+ this.$set(this.tableData[i],'isBlue',true)
this.$set(this.tableData[i],'pieceNumber'+form.pieceNumber+form.pieces,form.netWeight)
break;
}
}
}
- if(form.pieceNumber==3&&form.pieces==4){
- this.$refs.addProductDialog.proForm.carNumber=this.tableData[Number(string)+1].carNumber
- this.$refs.addProductDialog.proForm.pieceNumber=1
- this.$refs.addProductDialog.proForm.pieces=1
- }else{
- if(form.pieces==4){
- this.$refs.addProductDialog.proForm.pieceNumber=Number(form.pieceNumber)+1
+ if(form.netWeight){
+ if(form.pieceNumber==3&&form.pieces==4){
+ this.$refs.addProductDialog.proForm.carNumber=this.tableData[Number(string)+1].carNumber
+ this.$set(this.tableData[Number(string)],'isBlue',false)
+ this.$set(this.tableData[Number(string+1)],'isBlue',true)
+ this.$refs.addProductDialog.proForm.pieceNumber=1
this.$refs.addProductDialog.proForm.pieces=1
}else{
- this.$refs.addProductDialog.proForm.pieces=Number(form.pieces)+1
+ if(form.pieces==4){
+ this.$refs.addProductDialog.proForm.pieceNumber=Number(form.pieceNumber)+1
+ this.$refs.addProductDialog.proForm.pieces=1
+ }else{
+ this.$refs.addProductDialog.proForm.pieces=Number(form.pieces)+1
+ }
}
+ this.$refs.addProductDialog.proForm.netWeight=''
+ this.$forceUpdate();
}
- this.$refs.addProductDialog.proForm.netWeight=''
- this.$forceUpdate();
},
getSelectDataList() {
//杞﹂棿
@@ -863,11 +884,13 @@
if(Object.keys(data).length>0){
for(let i in data){
for(let j in data[i]){
- this.tableData.push({carNumber:data[i][j],perList:data[i]})
+ this.tableData.push({carNumber:data[i][j],perList:data[i],isBlue:false})
}
}
+ this.tableData[0].isBlue=true
}
this.ruleForm.carNumber=this.tableData.length>0?this.tableData[0].carNumber:''
+
}
});
}
@@ -948,47 +971,47 @@
for(let i in tableData){
circles.push({
- allYield:tableData[i].allYield1, //浜ч噺
+ allYield:tableData[i].allYield1||'', //浜ч噺
carNumber:tableData[i].carNumber,
circle:1,//鍥炴暟
- oneYield:tableData[i].oneYield1,// 鍙颁骇
- value1:tableData[i].pieceNumber11,//鐗囨暟
- value2:tableData[i].pieceNumber12,//鐗囨暟
- value3:tableData[i].pieceNumber13,//鐗囨暟
- value4:tableData[i].pieceNumber14,//鐗囨暟
- reelingdiscount:tableData[i].reelingdiscount1, //缂姌
+ oneYield:tableData[i].oneYield1||'',// 鍙颁骇
+ value1:tableData[i].pieceNumber11||'',//鐗囨暟
+ value2:tableData[i].pieceNumber12||'',//鐗囨暟
+ value3:tableData[i].pieceNumber13||'',//鐗囨暟
+ value4:tableData[i].pieceNumber14||'',//鐗囨暟
+ reelingdiscount:tableData[i].reelingdiscount1||'', //缂姌
// yieldRegisterId:''
})
circles.push({
- allYield:tableData[i].allYield2, //浜ч噺
+ allYield:tableData[i].allYield2||'', //浜ч噺
carNumber:tableData[i].carNumber,
circle:2,//鍥炴暟
- oneYield:tableData[i].oneYield2,// 鍙颁骇
- value1:tableData[i].pieceNumber21,//鐗囨暟
- value2:tableData[i].pieceNumber22,//鐗囨暟
- value3:tableData[i].pieceNumber23,//鐗囨暟
- value4:tableData[i].pieceNumber24,//鐗囨暟
- reelingdiscount:tableData[i].reelingdiscount2, //缂姌
+ oneYield:tableData[i].oneYield2||'',// 鍙颁骇
+ value1:tableData[i].pieceNumber21||'',//鐗囨暟
+ value2:tableData[i].pieceNumber22||'',//鐗囨暟
+ value3:tableData[i].pieceNumber23||'',//鐗囨暟
+ value4:tableData[i].pieceNumber24||'',//鐗囨暟
+ reelingdiscount:tableData[i].reelingdiscount2||'', //缂姌
// yieldRegisterId:''
})
circles.push({
- allYield:tableData[i].allYield3, //浜ч噺
+ allYield:tableData[i].allYield3||'', //浜ч噺
carNumber:tableData[i].carNumber,
circle:3,//鍥炴暟
- oneYield:tableData[i].oneYield3,// 鍙颁骇
- value1:tableData[i].pieceNumber31,//鐗囨暟
- value2:tableData[i].pieceNumber32,//鐗囨暟
- value3:tableData[i].pieceNumber33,//鐗囨暟
- value4:tableData[i].pieceNumber34,//鐗囨暟
- reelingdiscount:tableData[i].reelingdiscount3, //缂姌
+ oneYield:tableData[i].oneYield3||'',// 鍙颁骇
+ value1:tableData[i].pieceNumber31||'',//鐗囨暟
+ value2:tableData[i].pieceNumber32||'',//鐗囨暟
+ value3:tableData[i].pieceNumber33||'',//鐗囨暟
+ value4:tableData[i].pieceNumber34||'',//鐗囨暟
+ reelingdiscount:tableData[i].reelingdiscount3||'', //缂姌
// yieldRegisterId:''
})
items.push({
- hourYield:tableData[i].hourYield,
- carNumber:tableData[i].carNumber,
- oneYield:tableData[i].oneYield,
- peopleYield:tableData[i].peopleYield,
- personReelingdiscount:tableData[i].personReelingdiscount,
+ hourYield:tableData[i].hourYield||'',
+ carNumber:tableData[i].carNumber||'',
+ oneYield:tableData[i].oneYield||'',
+ peopleYield:tableData[i].peopleYield||'',
+ personReelingdiscount:tableData[i].personReelingdiscount||'',
// yieldRegisterId:''
})
}
--
Gitblit v1.8.0