From d5379b4f64dc7e317758339e721c4acbb371baae Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 10 四月 2024 17:49:29 +0800
Subject: [PATCH] 庄口，车间，组别，规格都修改为必填+根据车间获取组别的接口联调，重组得到的数据以便下拉数据的使用
---
src/views/productManage/silkRegisterForm/addPage.vue | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index e3ca7de..e1226e7 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -162,7 +162,7 @@
</el-row>
</el-form-item>
<el-form-item label="杞﹀彿" prop="position" class="form-item">
- <el-input v-model="form.position" placeholder="璇疯緭鍏�">
+ <el-input v-model.number="form.position" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
</el-form>
@@ -195,7 +195,7 @@
<!-- <CommonSearch :show-add="false" :show-download="false" :amount-view="false" :show-action-btn="false"
placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
<template slot="leftButton"> -->
- <el-button size="small" type="primary" @click="cancelClickTwo"
+ <el-button size="small" type="primary" @click="cancelClickOne"
>鏀惧純</el-button
>
<el-button
@@ -239,12 +239,13 @@
{{ form.finishDate }}
</el-form-item>
</div>
- <div class="list-view">
+ <div class="list-view-two">
<el-table
ref="multipleTable"
:data="tableTwoList.tableInfomation"
tooltip-effect="dark"
style="width: 100%"
+ :height="'calc(100% - 0px)'"
>
<el-table-column label="杞﹀彿" prop="ID" width="100">
</el-table-column>
@@ -316,11 +317,11 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="valueRange" label="閲庣氦" width="120">
+ <el-table-column prop="finenessGradeye" label="閲庣氦" width="120">
</el-table-column>
- <el-table-column prop="unit" label="澶ч噹" show-overflow-tooltip>
+ <el-table-column prop="finenessGradebig" label="澶ч噹" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="valueRange" label="鐗归噹" width="120">
+ <el-table-column prop="finenessGradeSpecial" label="鐗归噹" width="120">
</el-table-column>
<el-table-column
prop="finenessGrade"
@@ -461,7 +462,7 @@
],
// 缁勫埆 搴旇true
workshopGroup: [
- { required: false, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
+ { required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
circleTwo: [
{ required: true, message: "璇峰～鍐�", trigger: ["change", "blur"] },
@@ -576,6 +577,7 @@
this.tableList.tableData = config.finenessList
? config.finenessList
: [];
+ this.tableData=this.tableList.tableData
}
}
);
@@ -618,6 +620,15 @@
: [];
for(let i in arr){
let round=arr[i].finenessRoundingItems
+ if(arr[i].finenessGrade){
+ if(arr[i].finenessGrade.indexOf('閲庣氦')>-1){
+ arr[i].finenessGradeye=arr[i].finenessGrade
+ }else if(arr[i].finenessGrade.indexOf('澶ч噹')>-1){
+ arr[i].finenessGradebig=arr[i].finenessGrade
+ }else if(arr[i].finenessGrade.indexOf('鐗归噹')>-1){
+ arr[i].finenessGradeSpecial=arr[i].finenessGrade
+ }
+ }
if(round){
for(let j in round){
arr[i][round[j].fineness]=round[j].quantity
@@ -789,10 +800,15 @@
sum: "",
},
];
+ }else{
+ this.form.measureFineness=''
+ this.form.twiceChange=''
+ this.form.cleanliness=''
+ this.form.purity=''
+ this.form.marketProcessOrderNumber=''
+ this.form.inspector=''
}
},
- // 绾ゅ害妫�楠岃〃
- cancelClickTwo() {},
// 淇濆瓨
saveClickOne(formName) {
this.$refs[formName].validate((valid) => {
@@ -801,7 +817,7 @@
// params.workshopGroup=Number(params.workshopGroup)
this.isAddloading = true;
if (this.activeName == "first") {
- delete form.circle;
+ delete form.circleTwo;
let finenessList = JSON.parse(
JSON.stringify(this.tableList.tableData)
);
@@ -852,6 +868,7 @@
message: "淇濆瓨鎴愬姛锛�",
type: "success",
});
+ this.getDetailsData()
}
this.isAddloading = false;
})
@@ -887,7 +904,11 @@
height: 45px;
}
}
-
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
.custom-manage {
height: 100%;
overflow: hidden;
@@ -924,7 +945,7 @@
.body-l {
background-color: #fff;
border-radius: 12px;
- height: calc(100% - 180px - 20px);
+ height: calc(100% - 20px);
width: calc(100% - 420px);
float: left;
overflow: hidden;
@@ -957,9 +978,9 @@
}
.list-view {
- height: calc(100% - 0px);
+ height: calc(100% - 180px);
min-height: 200px;
- overflow: hidden;
+ overflow-y: auto;
}
}
@@ -1020,8 +1041,8 @@
}
}
- .list-view {
- max-height: calc(100% - 90px - 10px);
+ .list-view-two {
+ height: calc(100% - 120px);
overflow: hidden;
}
--
Gitblit v1.8.0