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 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
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) {
--
Gitblit v1.8.0