From 24cc28bb458f16af7aef99b1f9c3115996a2a3fa Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 12 四月 2024 16:23:50 +0800
Subject: [PATCH] 开始回数和结束回数不显示的问题修改
---
src/views/productManage/silkRegisterForm/addPage.vue | 144 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 42 deletions(-)
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index e3ca7de..6c4e516 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -80,6 +80,7 @@
v-model="form.name"
placeholder="璇烽�夋嫨"
class="select-width"
+ @change="getGroupNumber"
>
<el-option
v-for="item in nameList"
@@ -110,14 +111,15 @@
<el-form-item label="缁勫埆" prop="workshopGroup" class="form-item">
<el-select
v-model="form.workshopGroup"
- placeholder="璇烽�夋嫨"
+ placeholder="璇峰厛閫夋嫨杞﹂棿"
+ no-data-text="璇峰厛閫夋嫨杞﹂棿"
class="select-width"
>
<el-option
v-for="item in workshopGroupList"
- :key="item.ID"
- :label="item.name"
- :value="item.ID"
+ :key="item"
+ :label="item"
+ :value="item"
>
</el-option>
</el-select>
@@ -162,7 +164,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 +197,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
@@ -206,7 +208,7 @@
>淇濆瓨</el-button
>
<!-- </template>
-</CommonSearch> -->
+ </CommonSearch> -->
</div>
</div>
<div class="body-two body">
@@ -239,12 +241,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 +319,19 @@
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"
@@ -413,10 +424,10 @@
</template>
<script>
+// getWorkshopManageList,
import {
saveRegister,
getDictList,
- getWorkshopManageList,
getRegisterDetails,
} from "@/api/productManage/silkRegisterForm.js";
import {
@@ -425,6 +436,7 @@
} from "@/api/productManage/silkInspectForm.js";
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import CommonFormTableView from "@/components/makepager/CommonFormTableView";
+import { getWorkshopManageGroup } from "@/api/productManage/productRegisterForm.js";
export default {
name: "silkRegisterAddPage",
props: {},
@@ -461,7 +473,7 @@
],
// 缁勫埆 搴旇true
workshopGroup: [
- { required: false, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
+ { required: true, message: "璇烽�夋嫨", trigger: ["change", "blur"] },
],
circleTwo: [
{ required: true, message: "璇峰～鍐�", trigger: ["change", "blur"] },
@@ -573,9 +585,18 @@
JSON.stringify(response.data ? response.data : {})
);
this.form = config;
- this.tableList.tableData = config.finenessList
+ this.getGroupNumber()
+ let finenessList=config.finenessList
? config.finenessList
: [];
+ if(finenessList.length>0){
+ finenessList.map((item,index)=>{
+ item.productId=index+1
+ })
+ }
+ console.log(finenessList,'===finenessList')
+ this.tableList.tableData = finenessList
+ this.tableData = this.tableList.tableData;
}
}
);
@@ -613,18 +634,25 @@
this.form.finishDate = config.finenessRegister.finishDate;
this.form.circle = config.finenessRegister.circle;
this.getTableHeader();
- let arr= response.data.items
- ? response.data.items
- : [];
- for(let i in arr){
- let round=arr[i].finenessRoundingItems
- if(round){
- for(let j in round){
- arr[i][round[j].fineness]=round[j].quantity
- }
- }
+ let arr = response.data.items ? response.data.items : [];
+ 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;
+ }
}
- this.tableTwoList.tableInfomation =arr;
+ if (round) {
+ for (let j in round) {
+ arr[i][round[j].fineness] = round[j].quantity;
+ }
+ }
+ }
+ this.tableTwoList.tableInfomation = arr;
}
});
}
@@ -700,11 +728,11 @@
}
});
//缁勫埆
- getWorkshopManageList().then((res) => {
- if (res.code == 200) {
- this.workshopGroupList = res.data || [];
- }
- });
+ // getWorkshopManageList().then((res) => {
+ // if (res.code == 200) {
+ // this.workshopGroupList = res.data || [];
+ // }
+ // });
//搴勫彛
getDictList({
dictType: 0,
@@ -713,6 +741,31 @@
this.marketList = res.data || [];
}
});
+ },
+ getGroupNumber() {
+ if (this.form.name) {
+ //缁勫埆
+ let number = "";
+ for (let i in this.nameList) {
+ if (this.nameList[i].name == this.form.name) {
+ number = this.nameList[i].number;
+ break;
+ }
+ }
+ getWorkshopManageGroup({ number: number }).then((res) => {
+ if (res.code == 200) {
+ this.workshopGroupList = [];
+ let workshopGroupList = res.data || {};
+ if (Object.keys(workshopGroupList).length > 0) {
+ for (let i in workshopGroupList) {
+ this.workshopGroupList.push(workshopGroupList[i]);
+ }
+ }
+ }
+ });
+ } else {
+ this.workshopGroupList = [];
+ }
},
inputStart() {
this.form.circleTwo = this.form.circle + "-" + this.form.totalCircle;
@@ -789,10 +842,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 +859,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 +910,7 @@
message: "淇濆瓨鎴愬姛锛�",
type: "success",
});
+ this.getDetailsData();
}
this.isAddloading = false;
})
@@ -868,9 +927,6 @@
}
});
},
- // 鏀惧純
- cancelClick() {},
- saveClick() {},
},
};
</script>
@@ -887,7 +943,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 +984,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 +1017,9 @@
}
.list-view {
- height: calc(100% - 0px);
+ height: calc(100% - 180px);
min-height: 200px;
- overflow: hidden;
+ overflow-y: auto;
}
}
@@ -1020,8 +1080,8 @@
}
}
- .list-view {
- max-height: calc(100% - 90px - 10px);
+ .list-view-two {
+ height: calc(100% - 120px);
overflow: hidden;
}
--
Gitblit v1.8.0