From 8681593dd825847975a7584de719a75e57bf0aed Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 12 四月 2024 15:45:50 +0800
Subject: [PATCH] 车间管理模块新增和修改操作车间的时候入参和显示使用字段修改和逻辑处理
---
src/views/systemSetting/workshopManage/components/addDialog.vue | 2 +-
src/views/systemSetting/workshopManage/index.vue | 2 +-
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 48 ++++++++++++++++++++++++++++++++++++------------
3 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index ca339fe..b6b92d6 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -213,13 +213,20 @@
label=""
@input="inputStart"
label-width="0"
+ label-position="right"
prop="fallingSilkBucketOne"
+ :rules="[
+ {
+ required: ruleForm.isfallingSilkBucketOne,
+ message: '璇峰～鍐�',
+ trigger: 'change',
+ },
+ ]"
class='margin_right_10px select-width-input'
>
<el-input
v-model="ruleForm.fallingSilkBucketOne"
size="small"
- class="d-b-c-input"
></el-input>
</el-form-item>
<el-checkbox
@@ -231,6 +238,13 @@
label=""
@input="inputStart"
label-width="0"
+ :rules="[
+ {
+ required: ruleForm.isfallingSilkBucketTwo,
+ message: '璇峰～鍐�',
+ trigger: 'change',
+ },
+ ]"
prop="fallingSilkBucketTwo"
class='margin_right_10px select-width-input'
>
@@ -248,7 +262,14 @@
<el-form-item
label=""
@input="inputStart"
- label-width="0"
+ label-width=""
+ :rules="[
+ {
+ required: ruleForm.isfallingSilkBucketThree,
+ message: '璇峰～鍐�',
+ trigger: 'change',
+ },
+ ]"
prop="fallingSilkBucketThree"
class='margin_right_10px select-width-input'
>
@@ -759,18 +780,19 @@
if(this.tableDataCircles[j].carNumber==this.tableData[i].carNumber){
let circle=this.tableDataCircles[j].circle
let pieceNumberList=this.tableDataCircles[j].pieceNumbers||[]
- this.tableData[i]['allYield'+circle]=this.tableDataCircles[j]['allYield'+circle]
- this.tableData[i]['oneYield'+circle]=this.tableDataCircles[j]['oneYield'+circle]
- this.tableData[i]['reelingdiscount'+circle]=this.tableDataCircles[j]['reelingdiscount'+circle]
+ this.tableData[i]['allYield'+circle]=this.tableDataCircles[j]['allYield']
+ this.tableData[i]['oneYield'+circle]=this.tableDataCircles[j]['oneYield']
+ this.tableData[i]['reelingdiscount'+circle]=this.tableDataCircles[j]['reelingdiscount']
if(pieceNumberList.length>0){
for(let k in pieceNumberList){
- this.tableData[i]['pieceNumber'+circle+pieceNumberList[k].pieceNumber]
+ this.tableData[i]['pieceNumber'+circle+pieceNumberList[k].pieceNumber]=pieceNumberList[k].value
}
}
}
}
}
}
+ console.log(this.tableData,'==this.tableData')
this.ruleForm.carNumber=this.tableData.length>0?this.tableData[0].carNumber:''
},
// 琛ㄦ牸鐨勮绠楅棶棰�
@@ -907,6 +929,11 @@
})
this.$set(this.tableData[i],'isBlue',true)
this.$set(this.tableData[i],'pieceNumber'+form.pieceNumber+form.pieces,form.netWeight)
+ this.tableShow=false;
+ this.$nextTick(()=>{
+ this.tableShow=true;
+ this.$forceUpdate();
+ })
break;
}
}
@@ -1207,7 +1234,6 @@
circles.push(listItems3)
items.push(listItems4)
}
- console.log(circles,'circles')
let params = {
...form,
circles: circles,
@@ -1285,7 +1311,8 @@
.select-width {
width: calc(100% - 20px);
.select-width-input{
- width:calc(100% - 200px);float:left;
+ width:150px;
+ float:left;
}
}
.body-top {
@@ -1356,7 +1383,4 @@
.c-n {
cursor: no-drop;
}
-
-::v-deep {
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/systemSetting/workshopManage/components/addDialog.vue b/src/views/systemSetting/workshopManage/components/addDialog.vue
index 3f12c07..db6dd53 100644
--- a/src/views/systemSetting/workshopManage/components/addDialog.vue
+++ b/src/views/systemSetting/workshopManage/components/addDialog.vue
@@ -147,7 +147,7 @@
},
setParams(){
let params={
- workshopNumber:this.editConfig.infomitton.workshop.ID+"",
+ workshopNumber:this.editConfig.infomitton.workshop.number+"",
workshopName:this.editConfig.infomitton.workshop.name,
groupNumber:Number(this.editConfig.infomitton.groupNumber),
startCarNumber:Number(this.editConfig.infomitton.startCarNumber),
diff --git a/src/views/systemSetting/workshopManage/index.vue b/src/views/systemSetting/workshopManage/index.vue
index 1f1d1dc..997ccbb 100644
--- a/src/views/systemSetting/workshopManage/index.vue
+++ b/src/views/systemSetting/workshopManage/index.vue
@@ -187,7 +187,7 @@
this.editConfig.infomitton = {
...row,
workshop:{
- ID:row.workshopNumber,
+ number:row.workshopNumber,
name:row.workshopName
}
}
--
Gitblit v1.8.0