From 1cd64a26daed3e0eb7b4ccf74e50267d79eaef09 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 18:21:56 +0800
Subject: [PATCH] 纤度登记表的新增模块 限制数量只能输入整数
---
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 129 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index ca339fe..8edbfb9 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -91,9 +91,9 @@
</el-form-item>
</el-col>
<el-col :span="3">
- <el-form-item label="杞﹂棿" prop="workshopId">
+ <el-form-item label="杞﹂棿" prop="workshopNumber">
<el-select
- v-model="ruleForm.workshopId"
+ v-model="ruleForm.workshopNumber"
placeholder="璇烽�夋嫨"
class="select-width"
@change='getGroupNumber'
@@ -124,7 +124,7 @@
placeholder="璇峰厛閫夋嫨杞﹂棿"
no-data-text='璇峰厛閫夋嫨杞﹂棿'
class="select-width"
- @change='getGroupNumber'
+ @change="getGroupNumber(false,'groupNumber')"
>
<el-option
v-for="item in workshopGroupList"
@@ -213,17 +213,24 @@
label=""
@input="inputStart"
label-width="0"
+ label-position="right"
prop="fallingSilkBucketOne"
+ :rules="[
+ {
+ required: ruleForm.selectOne,
+ 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
- v-model="ruleForm.isfallingSilkBucketOne"
+ v-model="ruleForm.selectOne"
></el-checkbox>
</div>
<div class="select-width">
@@ -231,6 +238,13 @@
label=""
@input="inputStart"
label-width="0"
+ :rules="[
+ {
+ required: ruleForm.selectTwo,
+ message: '璇峰～鍐�',
+ trigger: 'change',
+ },
+ ]"
prop="fallingSilkBucketTwo"
class='margin_right_10px select-width-input'
>
@@ -241,14 +255,21 @@
></el-input>
</el-form-item>
<el-checkbox
- v-model="ruleForm.isfallingSilkBucketTwo"
+ v-model="ruleForm.selectTwo"
></el-checkbox>
</div>
<div class="select-width">
<el-form-item
label=""
@input="inputStart"
- label-width="0"
+ label-width=""
+ :rules="[
+ {
+ required: ruleForm.selectThree,
+ message: '璇峰～鍐�',
+ trigger: 'change',
+ },
+ ]"
prop="fallingSilkBucketThree"
class='margin_right_10px select-width-input'
>
@@ -259,7 +280,7 @@
></el-input>
</el-form-item>
<el-checkbox
- v-model="ruleForm.isfallingSilkBucketThree"
+ v-model="ruleForm.selectThree"
></el-checkbox>
</div>
</div>
@@ -470,7 +491,7 @@
align="center"
>
<template slot-scope="scope">
- {{scope.row.peopleYield!=0?scope.row.peopleYield:''}}
+ {{scope.row.peopleYield!=0?scope.row.peopleYield.toFixed(2):''}}
</template>
</el-table-column>
<el-table-column
@@ -618,7 +639,7 @@
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
- workshopId: "",
+ workshopNumber: "",
bucketCocoonNumber: "",
groupNumber: "",
vehicleSpeed: "",
@@ -630,11 +651,11 @@
groupReelingdiscount: "",
fallingSilkBucket: "",
fallingSilkBucketOne: "",
- isfallingSilkBucketOne: "",
+ selectOne: false,
fallingSilkBucketTwo: "",
- isfallingSilkBucketTwo: "",
+ selectTwo: false,
fallingSilkBucketThree: "",
- isfallingSilkBucketThree: "",
+ selectThree: false,
back: "",
oneBack: "",
twoBack: "",
@@ -651,7 +672,7 @@
marketId: [
{ required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
- workshopId: [
+ workshopNumber: [
{ required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
groupNumber: [
@@ -689,7 +710,7 @@
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
- workshopId: "",
+ workshopNumber: "",
bucketCocoonNumber: "",
groupNumber: "",
vehicleSpeed: "",
@@ -701,11 +722,11 @@
groupReelingdiscount: "",
fallingSilkBucket: "",
fallingSilkBucketOne: "",
- isfallingSilkBucketOne: "",
+ selectOne: false,
fallingSilkBucketTwo: "",
- isfallingSilkBucketTwo: "",
+ selectTwo: false,
fallingSilkBucketThree: "",
- isfallingSilkBucketThree: "",
+ selectThree: false,
back: "",
oneBack: "",
twoBack: "",
@@ -722,7 +743,7 @@
JSON.stringify(response.data ? response.data : {})
);
this.ruleForm = config;
- this.$set(this.ruleForm,'workshopId',this.ruleForm.workshopId+'')
+ this.$set(this.ruleForm,'workshopNumber',this.ruleForm.workshopNumber+'')
this.tableDataItems=config.items
? config.items
: [];
@@ -759,12 +780,12 @@
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
}
}
}
@@ -816,7 +837,7 @@
}
this.getPeopleYield(row)
row.oneYield=Number(string);
- return string;
+ return string.toFixed(2);
},
getPeopleYield(row){
let string=0
@@ -856,7 +877,7 @@
}
}
row['allYield'+val]=Number(string);
- return string;
+ return string.toFixed(2);
},
changeForm(form,val,data){
if(val){
@@ -865,7 +886,7 @@
JSON.stringify(data ? data : {})
);
this.ruleForm = config;
- this.$set(this.ruleForm,'workshopId',this.ruleForm.workshopId+'')
+ this.$set(this.ruleForm,'workshopNumber',this.ruleForm.workshopNumber+'')
this.tableDataItems=config.items
? config.items
: [];
@@ -907,6 +928,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;
}
}
@@ -944,7 +970,7 @@
}).then((res) => {
if (res.code == 200) {
this.nameList = res.data || [];
- this.$set(this.ruleForm,'workshopId',this.ruleForm.workshopId+'')
+ this.$set(this.ruleForm,'workshopNumber',this.ruleForm.workshopNumber+'')
}
});
//瑙勬牸
@@ -964,25 +990,36 @@
}
});
},
- getGroupNumber(val){
- if(this.ruleForm.workshopId){
+ getGroupNumber(val,prop){
+ if(this.ruleForm.workshopNumber){
//缁勫埆
- getWorkshopManageGroup({number:this.ruleForm.workshopId}).then((res) => {
+ getWorkshopManageGroup({number:this.ruleForm.workshopNumber}).then((res) => {
if (res.code == 200) {
- this.workshopGroupList=[]
let workshopGroupList = res.data || {};
+ this.workshopGroupList=[]
if(Object.keys(workshopGroupList).length>0){
for(let i in workshopGroupList){
this.workshopGroupList.push(workshopGroupList[i])
}
- this.$set(this.ruleForm,'groupNumber',this.ruleForm.groupNumber)
+ if(prop&&prop!='groupNumber'){
+ this.ruleForm.groupNumber=''
+ }
+ // 缂栬緫
+ if(val){
+ setTimeout(()=>{
+ this.$set(this.ruleForm,'groupNumber',this.ruleForm.groupNumber)
+ },200)
+ }
}
+ }else{
+ this.workshopGroupList=[]
+ this.ruleForm.groupNumber=''
}
});
if(this.ruleForm.groupNumber&&this.ruleForm.marketId){
let workshopName=''
for(let i in this.nameList){
- if( this.nameList[i].number==this.ruleForm.workshopId){
+ if( this.nameList[i].number==this.ruleForm.workshopNumber){
workshopName= this.nameList[i].name
break;
}
@@ -1017,6 +1054,10 @@
if(val){
this.getTableEdit()
}
+ }else{
+ this.tableData=[]
+ this.ruleForm.level=''
+ this.ruleForm.carNumber=''
}
});
}
@@ -1052,7 +1093,7 @@
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
- workshopId: "",
+ workshopNumber: "",
bucketCocoonNumber: "",
groupNumber: "",
vehicleSpeed: "",
@@ -1064,11 +1105,11 @@
groupReelingdiscount: "",
fallingSilkBucket: "",
fallingSilkBucketOne: "",
- isfallingSilkBucketOne: "",
+ selectOne: false,
fallingSilkBucketTwo: "",
- isfallingSilkBucketTwo: "",
+ selectTwo: false,
fallingSilkBucketThree: "",
- isfallingSilkBucketThree: "",
+ selectThree:false,
back: "",
oneBack: "",
twoBack: "",
@@ -1106,11 +1147,6 @@
form.theorySilkAmount=Number(form.theorySilkAmount)
form.total=Number(form.total)
form.vehicleSpeed=Number(form.vehicleSpeed)
- form.workshopId =Number(form.workshopId)
- delete form.isfallingSilkBucketOne
- delete form.isfallingSilkBucketThree
- delete form.isfallingSilkBucketTwo
- debugger
for(let i in tableData){
let listItems1={
allYield:Number(tableData[i].allYield1)||0, //浜ч噺
@@ -1207,7 +1243,6 @@
circles.push(listItems3)
items.push(listItems4)
}
- console.log(circles,'circles')
let params = {
...form,
circles: circles,
@@ -1285,7 +1320,8 @@
.select-width {
width: calc(100% - 20px);
.select-width-input{
- width:calc(100% - 200px);float:left;
+ width:150px;
+ float:left;
}
}
.body-top {
@@ -1356,7 +1392,4 @@
.c-n {
cursor: no-drop;
}
-
-::v-deep {
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0