From fd35a7076c61a789853a34511dbb1689e5658678 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 一月 2024 14:17:26 +0800
Subject: [PATCH] 生产调度bug修改
---
src/views/quality/rawMaterial/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 3437c51..ecdd037 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -17,7 +17,7 @@
<template>
<div class="mod-config">
<basic-container>
- <ttable
+ <ttable
:table="table"
:resultData="resultData"
@handleSelectionChange="handleSelectionChange"
@@ -60,7 +60,7 @@
import { mapGetters } from 'vuex'
import PrintJS from 'print-js'
import { transformZip } from '@/util/fileTransform'
-import printTemplate from './rawMaterial-print.vue'
+import printTemplate from './rawMaterial-print'
export default {
data() {
return {
@@ -232,7 +232,7 @@
RawMaterialForm,
printTemplate,
},
- created() {
+ created() {
if(this.permissions.quality_rawMaterial_add){
this.table.toolbar.push({
text: '鏂板',
@@ -374,8 +374,10 @@
}
this.$router.push({
name: 'rawMaterialForm',
- query: {
- id: row == null ? null : row.id,
+ query: {
+ id: row == null ? null : row.id
+ },
+ params: {
resultVal: row == null ? null : row.judgeState
}
})
@@ -389,7 +391,7 @@
}
},
formatJudgeState(row, column, cellValue){
- if(cellValue != undefined || cellValue != null){
+ if(cellValue != undefined && cellValue != null && cellValue != ''){
if(cellValue == 0){
return "<span style='color:#E84738;'>涓嶅悎鏍�</span>"
}
@@ -435,4 +437,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3