From 71754fe875a9a550e19c5192163f4256461aaeab Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 22 一月 2024 10:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/index.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 3437c51..4be4f40 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,7 +374,7 @@
}
this.$router.push({
name: 'rawMaterialForm',
- query: {
+ query: {
id: row == null ? null : row.id,
resultVal: row == null ? null : row.judgeState
}
@@ -389,8 +389,9 @@
}
},
formatJudgeState(row, column, cellValue){
- if(cellValue != undefined || cellValue != null){
+ if(cellValue != undefined && cellValue != null && cellValue != ''){
if(cellValue == 0){
+ console.log(cellValue);
return "<span style='color:#E84738;'>涓嶅悎鏍�</span>"
}
return "<span style='color:#34BD66;'>鍚堟牸</span>"
@@ -435,4 +436,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3