From c77637aa6781f3275839674cb4fa2d4b72b8827c Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 15 七月 2024 19:34:55 +0800
Subject: [PATCH] fix:修复纤度登记表，检验表，产量等级表部分的bug修复
---
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 108 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index a710dbc..a4c0478 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -37,7 +37,7 @@
class="demo-ruleForm"
>
<el-row>
- <el-col :span="3">
+ <el-col :span="4">
<el-form-item label="缂栧彿" prop="number">
<el-input v-model="ruleForm.number" size="small"></el-input>
</el-form-item>
@@ -48,7 +48,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
<el-form-item label="鐢熶骇鏃ユ湡" prop="createTime">
<el-date-picker
value-format="yyyy-MM-dd"
@@ -66,7 +66,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
<el-form-item label="搴勫彛" prop="marketId">
<el-select
v-model="ruleForm.marketId"
@@ -90,7 +90,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
<el-form-item label="杞﹂棿" prop="workshopNumber">
<el-select
v-model="ruleForm.workshopNumber"
@@ -117,7 +117,7 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
<el-form-item label="缁勫埆" prop="groupNumber">
<el-select
v-model="ruleForm.groupNumber"
@@ -142,7 +142,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="4">
<el-form-item label="瑙勬牸" prop="spec">
<el-select
v-model="ruleForm.spec"
@@ -158,24 +158,20 @@
</el-option>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="5">
<el-form-item label="涔欑彮鏃堕棿" prop="timeYi">
<el-date-picker
- value-format="yyyy-MM-dd"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- v-model="ruleForm.timeYi"
- size="small"
- style="width: 100%"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ v-model="ruleForm.timeYi"
+ size="small"
+ style="width: 100%"
></el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="3">
- <el-form-item label="鏄惁缁撳簞" prop="jieZhuang">
- <el-input
- v-model="ruleForm.jieZhuang"
- size="small"
- ></el-input>
- </el-form-item>
+ <el-col :span="5">
<el-form-item label="鐢茬彮鏃堕棿" prop="timeJia">
<el-date-picker
value-format="yyyy-MM-dd"
@@ -187,6 +183,18 @@
></el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="4">
+ <el-form-item label="鏄惁缁撳簞" prop="jieZhuang">
+ <el-select v-model="ruleForm.jieZhuang" size="small">
+ <el-option label="鏄�" value="鏄�"></el-option>
+ <el-option label="鍚�" valu="鍚�"></el-option>
+ </el-select>
+ <!--<el-input
+ v-model="ruleForm.jieZhuang"
+ size="small"
+ ></el-input>-->
+ </el-form-item>
+ </el-col>
<el-col :span="3">
<el-form-item label="绛夌骇" prop="level">
<el-input
@@ -195,11 +203,12 @@
size="small"
></el-input>
</el-form-item>
-
+ </el-col>
+ <el-col :span="3">
<el-form-item label="杞︾粍缂姌" prop="groupReelingdiscount">
<el-input
- v-model="ruleForm.groupReelingdiscount"
- size="small"
+ v-model="ruleForm.groupReelingdiscount"
+ size="small"
></el-input>
</el-form-item>
</el-col>
@@ -487,7 +496,7 @@
align="center"
>
<template slot-scope="scope">
- {{scope.row.peopleYield!=0?scope.row.peopleYield.toFixed(2):''}}
+ {{scope.row.peopleYield!=0?scope.row.peopleYield:''}}
</template>
</el-table-column>
<el-table-column
@@ -497,7 +506,7 @@
align="center"
>
<template slot-scope="scope">
- {{(ruleForm.record&&ruleForm.record!=0&&scope.row.oneYield)?(scope.row.oneYield/ruleForm.record).toFixed(2):''}}
+ {{(ruleForm.record&&ruleForm.record!=0&&scope.row.oneYield)?((scope.row.oneYield/ruleForm.record)||0):''}}
</template>
</el-table-column>
<el-table-column
@@ -523,7 +532,7 @@
width="60"
align="center">
<template slot-scope="scope">
- {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield1)?(scope.row.allYield1/ruleForm.record).toFixed(2):''}}
+ {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield1)?((scope.row.allYield1/ruleForm.record)):''}}
</template>
</el-table-column>
<el-table-column
@@ -550,7 +559,7 @@
align="center"
>
<template slot-scope="scope">
- {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield2)?(scope.row.allYield2/ruleForm.record).toFixed(2):''}}
+ {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield2)?((scope.row.allYield2/ruleForm.record)):''}}
</template>
</el-table-column>
<el-table-column
@@ -577,7 +586,7 @@
align="center"
>
<template slot-scope="scope">
- {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield3)?(scope.row.allYield3/ruleForm.record).toFixed(2):''}}
+ {{(ruleForm.record&&ruleForm.record!=0&&scope.row.allYield3)?((scope.row.allYield3/ruleForm.record)):''}}
</template>
</el-table-column>
<el-table-column
@@ -600,7 +609,6 @@
@changeForm='changeForm'
@changeTableInput='changeTableInput' />
</div>
-
</template>
<script>
@@ -613,7 +621,9 @@
} from "@/api/productManage/productRegisterForm.js";
import {
getDictList,
+ getAutoCode
} from "@/api/productManage/silkRegisterForm.js";
+
export default {
name: "addProductRegisterPage",
props: {},
@@ -638,7 +648,7 @@
ruleForm: {
number: "",
record: "",
- createTime: "",
+ createTime: new Date(),
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
@@ -705,11 +715,19 @@
this.getDetailsData()
},
methods: {
+ async getAutoCode(){
+ const {code,data}=await getAutoCode({type:3});
+ if(code===200){
+ return data.id;
+ }
+ return ""
+ },
async getDetailsData(){
+ const code =await this.getAutoCode();
this.ruleForm = {
- number: "",
+ number: code,
record: "",
- createTime: "",
+ createTime: new Date(),
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
@@ -840,7 +858,7 @@
}
this.getPeopleYield(row)
row.oneYield=Number(string);
- return string.toFixed(2);
+ return parseFloat(string||0).toFixed(2);
},
getPeopleYield(row){
let string=0
@@ -880,7 +898,7 @@
}
}
row['allYield'+val]=Number(string);
- return string.toFixed(2);
+ return parseFloat(string||'0').toFixed(2);
},
changeForm(form,val,data){
if(val){
@@ -928,7 +946,7 @@
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)
this.tableShow=false;
@@ -999,7 +1017,7 @@
getWorkshopManageGroup({number:this.ruleForm.workshopNumber}).then((res) => {
if (res.code == 200) {
let workshopGroupList = res.data || {};
- this.workshopGroupList=[]
+ this.workshopGroupList=[];
if(Object.keys(workshopGroupList).length>0){
for(let i in workshopGroupList){
this.workshopGroupList.push(workshopGroupList[i])
@@ -1011,11 +1029,11 @@
if(val){
setTimeout(()=>{
this.$set(this.ruleForm,'groupNumber',this.ruleForm.groupNumber)
- },200)
+ },200);
}
}
}else{
- this.workshopGroupList=[]
+ this.workshopGroupList=[];
this.ruleForm.groupNumber=''
}
});
@@ -1030,7 +1048,7 @@
let marketName=''
for(let i in this.marketList){
if( this.marketList[i].ID==this.ruleForm.marketId){
- marketName= this.marketList[i].name
+ marketName= this.marketList[i].name;
break;
}
}
@@ -1049,10 +1067,10 @@
this.tableData.push({carNumber:data[i][j],perList:data[i],isBlue:false})
}
}
- this.tableData[0].isBlue=true
+ //this.tableData[0].isBlue=true
}
this.ruleForm.carNumber=this.tableData.length>0?this.tableData[0].carNumber:''
-
+ console.log(this.tableData);
// 缂栬緫
if(val){
this.getTableEdit()
@@ -1062,6 +1080,9 @@
this.ruleForm.level=''
this.ruleForm.carNumber=''
}
+ },(error)=>{
+ this.ruleForm.groupNumber=''
+ this.tableData=[];
});
}
}else{
@@ -1088,11 +1109,12 @@
this.$router.go(-1);
},
// 鏀惧純
- cancelClickOne() {
+ async cancelClickOne() {
+ const code =await this.getAutoCode();
this.ruleForm = {
- number: "",
+ number: code,
record: "",
- createTime: "",
+ createTime: new Date(),
circle: "",
marketId: "",
fallingSilkCocoonNumber: "",
--
Gitblit v1.8.0