From 80d7c1800518dbe1a34fbc48e5276ee75ecfef10 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 22 一月 2024 14:49:47 +0800
Subject: [PATCH] 不合格品处置修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 3 +--
src/views/quality/processconfiguration/index.vue | 28 ++++++++++++++++------------
src/views/quality/rawMaterial/index.vue | 4 +++-
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index b364506..d6d25d3 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -41,9 +41,9 @@
<el-radio-group v-model="checkList">
<el-radio label="杩斾慨">杩斾慨</el-radio>
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</el-radio-group>
</div>
<div v-if="type === '杩囩▼妫�楠�'">
@@ -52,12 +52,12 @@
<div style="padding: 20px;">
<el-radio label="杩斾慨">杩斾慨</el-radio>
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
- <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
- <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
</div>
<div style="padding: 20px;">
- <el-radio label="杩斿伐">杩斿伐</el-radio>
- <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</div>
</el-row>
</el-radio-group>
@@ -73,7 +73,7 @@
</template>
<script>
-import {
+import {
UnqualifiedList,
pullInsUnapi,
AuditSuggestion,
@@ -263,7 +263,7 @@
// return this.processModeOptions
// }
// },
-
+
],
toolbar: [
// {
@@ -301,7 +301,11 @@
text: '鎻愪氦瀹℃牳',
type: 'text',
size: 'small',
- fun: this.Submitreview
+ fun: this.Submitreview,
+ show: {
+ key: 'state',
+ val: ['0']
+ }
})
}
if(this.permissions.quality_processconfiguration_result){
@@ -369,7 +373,7 @@
this.$refs.processconfiguration.refreshData()
})
},
-
+
//鐘舵��
formatInsState(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
@@ -391,7 +395,7 @@
}
return "<span style='color:#34BD66;'></span>"
}
- },
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
// this.$refs.processconfiguration.getDataList()
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 4be4f40..661b2ea 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -375,7 +375,9 @@
this.$router.push({
name: 'rawMaterialForm',
query: {
- id: row == null ? null : row.id,
+ id: row == null ? null : row.id
+ },
+ params: {
resultVal: row == null ? null : row.judgeState
}
})
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3bbd00e..00bbc6d 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -492,8 +492,7 @@
},
created(){
this.dataForm.id = this.$route.query.id
- this.resultVal = this.$route.query.resultVal
- console.log("aa--",this.resultVal);
+ this.resultVal = this.$route.params.resultVal
if(this.resultVal == null){
let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
val == undefined ? null : this.resultVal=val
--
Gitblit v1.9.3