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/silkRegisterForm/addPage.vue | 44 ++++++++--
src/views/systemSetting/silkStandardSetting/components/silkTableList.vue | 4
src/views/productManage/silkRegisterForm/index.vue | 11 +-
src/views/systemSetting/dataDictionary/components/silkTableList.vue | 4
src/common/untils/request.js | 2
vue.config.js | 4
src/views/productManage/productRegisterForm/components/addProductDialog.vue | 4
src/views/systemSetting/workshopManage/components/silkTableList.vue | 4
src/views/systemSetting/encodeManage/components/silkTableList.vue | 4
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 108 ++++++++++++++++----------
10 files changed, 122 insertions(+), 67 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index d7bddfd..e0eae87 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -43,7 +43,7 @@
message: res.data.msg,
type: "error",
duration: 5 * 1000
- })
+ });
return Promise.reject(res.data)
}
},
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: "",
diff --git a/src/views/productManage/productRegisterForm/components/addProductDialog.vue b/src/views/productManage/productRegisterForm/components/addProductDialog.vue
index af31334..3bc3d68 100644
--- a/src/views/productManage/productRegisterForm/components/addProductDialog.vue
+++ b/src/views/productManage/productRegisterForm/components/addProductDialog.vue
@@ -118,7 +118,7 @@
<span slot="label">
<span class="formLabel">鍑�閲�</span>
</span>
- <el-input v-model="proForm.netWeight" @blur="changeTableInput" size="small"></el-input>
+ <el-input v-model="proForm.netWeight" @blur="changeTableInput" @keypress.enter.native="changeTableInput" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
@@ -256,7 +256,7 @@
this.workshopGroupList=[]
let workshopGroupList = res.data || {};
this.workshopGroupList=[]
- this.ruleForm.groupNumber=''
+ //this.ruleForm.groupNumber=''
if(Object.keys(workshopGroupList).length>0){
for(let i in workshopGroupList){
this.workshopGroupList.push(workshopGroupList[i])
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index e8967a6..b7bd39a 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -30,6 +30,7 @@
type="primary"
:loading="isAddloading"
@click="saveClickOne('form')"
+ :disabled="title==='鏌ョ湅'"
>淇濆瓨</el-button
>
</template>
@@ -47,7 +48,7 @@
label-width="80px"
>
<el-form-item label="缂栧彿" prop="number" class="form-item">
- <el-input v-model="form.number" :disabled="title=='淇敼'?true:false" placeholder="璇疯緭鍏�"> </el-input>
+ <el-input v-model="form.number" :disabled="title=='淇敼'||title=='鏌ョ湅'?true:false" placeholder="璇疯緭鍏�"> </el-input>
</el-form-item>
<el-form-item label="钀戒笣鏃堕棿" prop="finishDate" class="form-item">
<el-date-picker
@@ -57,6 +58,7 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
class="select-width"
+ :disabled='title==="鏌ョ湅"'
>
</el-date-picker>
</el-form-item>
@@ -66,6 +68,7 @@
placeholder="璇烽�夋嫨"
class="select-width"
@change="getGroupNumber"
+ :disabled='title==="鏌ョ湅"'
>
<el-option
v-for="item in marketList"
@@ -81,6 +84,7 @@
v-model="form.workshopObj"
placeholder="璇烽�夋嫨"
class="select-width"
+ :disabled='title==="鏌ョ湅"'
@change="getGroupNumber('workshopObj')">
<el-option
v-for="item in nameList"
@@ -95,6 +99,7 @@
v-model="form.spec"
placeholder="璇烽�夋嫨"
class="select-width"
+ :disabled='title==="鏌ョ湅"'
>
<el-option
v-for="item in specList"
@@ -113,6 +118,7 @@
placeholder="璇峰厛閫夋嫨杞﹂棿"
no-data-text="璇峰厛閫夋嫨杞﹂棿"
class="select-width"
+ :disabled='title==="鏌ョ湅"'
@change="getGroupNumber()"
>
<el-option
@@ -138,6 +144,7 @@
placeholder="璇疯緭鍏�"
show-word-limit
class="select-width"
+ :disabled='title==="鏌ョ湅"'
></el-input>
</el-form-item>
</el-col>
@@ -154,6 +161,7 @@
@input="inputStart"
placeholder="璇疯緭鍏�"
show-word-limit
+ :disabled='title==="鏌ョ湅"'
class="select-width"
></el-input>
</el-form-item>
@@ -203,8 +211,8 @@
type="primary"
:loading="isAddloading"
@click="saveClickOne('form')"
- >淇濆瓨</el-button
- >
+ :disabled="title==='鏌ョ湅'"
+ >淇濆瓨</el-button>
<!-- </template>
</CommonSearch> -->
</div>
@@ -268,6 +276,9 @@
show-overflow-tooltip
:sortable="item.sortable"
>
+ <template slot-scope="scope">
+ {{scope.row[item.prop]}}
+ </template>
</el-table-column>
</template>
</el-table-column>
@@ -288,6 +299,9 @@
show-overflow-tooltip
:sortable="item.sortable"
>
+ <template slot-scope="scope">
+ {{scope.row[item.prop]}}
+ </template>
</el-table-column>
</template>
</el-table-column>
@@ -297,6 +311,9 @@
width="100"
align="center"
>
+ <template slot-scope="scope">
+ {{scope.row[item.prop]}}
+ </template>
<template v-for="(item, i) in tableTwoList.upper">
<el-table-column
align="center"
@@ -308,6 +325,9 @@
show-overflow-tooltip
:sortable="item.sortable"
>
+ <template slot-scope="scope">
+ {{scope.row[item.prop]}}
+ </template>
</el-table-column>
</template>
</el-table-column>
@@ -545,7 +565,8 @@
label: "绾ゅ害鍊�",
prop: "fineness",
inputNumber: true,
- isRequird: true
+ isRequird: true,
+ noOperate:this.$route.query.title==='鏌ョ湅'
}, // 閿�鍞礋璐ｄ汉
{
label: "鏁伴噺",
@@ -683,11 +704,11 @@
}
if (round) {
for (let j in round) {
- arr[i][round[j].fineness] = round[j].quantity;
+ arr[i][round[j].fineness.toString()] = round[j].quantity;
}
}
}
- this.tableTwoList.tableInfomation = arr;
+ this.tableTwoList.tableInfomation = arr;
}
});
}
@@ -708,7 +729,7 @@
let item = {
label: lowNumber + i * 0.5 + "",
prop: lowNumber + i * 0.5 + "",
- min: 100,
+ min: 50,
default: true,
};
this.tableTwoList.objective.push(item);
@@ -721,7 +742,7 @@
let item = {
label: lowStart + i * 0.5 + "",
prop: lowStart + i * 0.5 + "",
- min: 100,
+ min: 50,
default: true,
};
this.tableTwoList.lower.push(item);
@@ -734,7 +755,7 @@
let item = {
label: topNumber + i * 0.5 + "",
prop: topNumber + i * 0.5 + "",
- min: 100,
+ min: 50,
default: true,
};
this.tableTwoList.upper.push(item);
@@ -891,6 +912,7 @@
activeName: this.activeName,
inspectID: this.inspectID,
id: this.registerId,
+ title:this.title
},
});
this.getDetailsData();
@@ -964,6 +986,7 @@
}
for (let i in finenessList) {
delete finenessList[i].productId;
+ finenessList[i].sum=finenessList[i].sum*1;
}
this.isAddloading = true;
const mapFineness=new Map();
@@ -981,10 +1004,11 @@
mapFineness.set(item.position,[item]);
}
});
+ console.log("淇敼",mapFineness)
finenessList=[...mapFineness.values()].flat(Infinity);
let params = {
- finenessList: finenessList,
...form,
+ finenessList: finenessList,
};
// 缂栬緫
if (this.inspectID) {
diff --git a/src/views/productManage/silkRegisterForm/index.vue b/src/views/productManage/silkRegisterForm/index.vue
index e6e7349..0281044 100644
--- a/src/views/productManage/silkRegisterForm/index.vue
+++ b/src/views/productManage/silkRegisterForm/index.vue
@@ -28,9 +28,10 @@
@selTableCol="selTableCol"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="90" fixed="right">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">淇敼</el-button>
+ <el-button @click="handleClick(scope.row,1)" type="text" size="small">鏌ョ湅</el-button>
+ <el-button @click="handleClick(scope.row,2)" type="text" size="small">淇敼</el-button>
<el-button @click="delClick(scope.row.ID)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -67,7 +68,7 @@
{ label: "钀戒笣鏃堕棿", prop: "finishDate", min: 190, }, // 瀹㈡埛鍚嶇О
{ label: "杞︾粍", prop: "workshopGroup", min: 100, }, // 鑱旂郴浜哄鍚�
{ label: "瑙勬牸", prop: "spec", min: 100 }, // 瀹㈡埛鐘舵��
- { label: "杞﹂棿", prop: "name", min: 100 }, // 鑱旂郴鏂瑰紡
+ { label: "杞﹂棿", prop: "workshopName", min: 100 }, // 鑱旂郴鏂瑰紡
{ label: "搴勫彛", prop: "market", min: 130 }, // 鑱旂郴浜烘棩鏈�
{ label: "寮�濮嬪洖鏁�", prop: "circle", min: 130 }, // 涓嬫鍥炶鏃ユ湡
{ label: "缁撴潫鍥炴暟", prop: "totalCircle", min: 110 }, // 璐熻矗浜�
@@ -175,14 +176,14 @@
},
// 缂栬緫
- handleClick(row) {
+ handleClick(row,type) {
this.$router.push({
path:"/productManage/silkRegisterForm/addPage",
query:{
id:row.ID,
activeName:'first',
inspectID:row.finenessCheckID,
- title:'淇敼'
+ title:type===1?'鏌ョ湅':'淇敼'
}
});
},
diff --git a/src/views/systemSetting/dataDictionary/components/silkTableList.vue b/src/views/systemSetting/dataDictionary/components/silkTableList.vue
index b75b518..5d3e076 100644
--- a/src/views/systemSetting/dataDictionary/components/silkTableList.vue
+++ b/src/views/systemSetting/dataDictionary/components/silkTableList.vue
@@ -327,7 +327,9 @@
//瑙ｅ喅琛ㄦ牸鎶栧姩闂
beforeUpdate() {
this.$nextTick(() => {
- this.$refs["fromTable"].doLayout()
+ if(this.$refs["fromTable"]){
+ this.$refs["fromTable"].doLayout()
+ }
})
},
}
diff --git a/src/views/systemSetting/encodeManage/components/silkTableList.vue b/src/views/systemSetting/encodeManage/components/silkTableList.vue
index 8875782..6bcfe15 100644
--- a/src/views/systemSetting/encodeManage/components/silkTableList.vue
+++ b/src/views/systemSetting/encodeManage/components/silkTableList.vue
@@ -327,7 +327,9 @@
//瑙ｅ喅琛ㄦ牸鎶栧姩闂
beforeUpdate() {
this.$nextTick(() => {
- this.$refs["fromTable"].doLayout()
+ if(this.$refs["fromTable"]){
+ this.$refs["fromTable"].doLayout()
+ }
})
}
}
diff --git a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
index 5881827..34d5eb1 100644
--- a/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
+++ b/src/views/systemSetting/silkStandardSetting/components/silkTableList.vue
@@ -355,7 +355,9 @@
//瑙ｅ喅琛ㄦ牸鎶栧姩闂
beforeUpdate() {
this.$nextTick(() => {
- this.$refs["fromTable"].doLayout()
+ if(this.$refs["fromTable"]){
+ this.$refs["fromTable"].doLayout()
+ }
})
}
}
diff --git a/src/views/systemSetting/workshopManage/components/silkTableList.vue b/src/views/systemSetting/workshopManage/components/silkTableList.vue
index 144358d..4992e0c 100644
--- a/src/views/systemSetting/workshopManage/components/silkTableList.vue
+++ b/src/views/systemSetting/workshopManage/components/silkTableList.vue
@@ -406,7 +406,9 @@
//瑙ｅ喅琛ㄦ牸鎶栧姩闂
beforeUpdate() {
this.$nextTick(() => {
- this.$refs["fromTable"].doLayout()
+ if(this.$refs["fromTable"]){
+ this.$refs["fromTable"].doLayout()
+ }
})
},
}
diff --git a/vue.config.js b/vue.config.js
index 8800196..ead979c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
function resolve(dir) {
return path.join(__dirname, dir)
}
-const ipNum=59;
-const serverPath='http://192.168.0.86:8008';
+const ipNum=105;
+const serverPath='http://192.168.0.105:8008';
// 璁剧疆涓嶅弬涓庢瀯寤虹殑搴�
const externals = {};
module.exports = {
--
Gitblit v1.8.0