Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2024-01-25 36653c98622c8a74cb850575b2001457121b794c

 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>