From ca24e514400e386de5066ec6e423d7fd2de43f65 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 一月 2024 16:30:17 +0800
Subject: [PATCH] 不合格状态

---
 src/views/quality/rawMaterial/index.vue |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 3437c51..0839cf1 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 {
@@ -102,6 +102,17 @@
                         isSearch: true,
                         searchInfoType: 'text',
                         render: { fun: this.addOrUpdateHandle }
+                    },
+                    {
+                        minWidth: '120',
+                        prop: 'type',
+                        label: '妫�楠岀被鍨�',
+                        isTrue: true,
+                        isSearch: true,
+                        searchInfoType: 'select',
+                        optList: () => {
+                            return this.typeList
+                        }
                     },
                     {
                         minWidth: '120',
@@ -225,6 +236,7 @@
             },
             insStateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉娴�',value:'1'},{label:'鏈娴�',value:'0'}],
             StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸插悎鏍�',value:'1'},{label:'涓嶅悎鏍�',value:'0'}],
+            typeList: [{label:'鍏ㄩ儴',value:''},{label:'棣栨',value:'棣栨'},{label:'杩旀',value:'杩旀'}],
         }
     },
     components: {
@@ -232,7 +244,7 @@
         RawMaterialForm,
         printTemplate,
     },
-    created() { 
+    created() {
         if(this.permissions.quality_rawMaterial_add){
             this.table.toolbar.push({
                 text: '鏂板',
@@ -374,8 +386,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 +403,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 +449,3 @@
     }
   }
   </script>
-  
\ No newline at end of file

--
Gitblit v1.9.3