mes-ocea-before.git

			@@ -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: '新增',
			@@ -244,7 +256,10 @@
			this.table.toolbar.push({
			text: '下载检验报告',
			type: 'primary',
			fun: this.downloadReport
			loading: false,
			disabled: false,
			fun: this.downloadReport,

			})
			}
			if(this.permissions.quality_rawMaterial_del){
			@@ -284,11 +299,18 @@
			selection.forEach(ele=>{
			ids.push(ele.id)
			})
			downloadReport({ids : ids}).then(res=>{
			transformZip(res)
			}).catch(error=>{
			this.table.toolbar.find((e) => e.text === '下载检验报告').loading = true
			this.table.toolbar.find((e) => e.text === '下载检验报告').disabled = true
			try{
			downloadReport({ids : ids}).then(res=>{
			transformZip(res)
			})
			}catch(error){
			console.log(error)
			})
			} finally{
			this.table.toolbar.find((e) => e.text === '下载检验报告').loading = false
			this.table.toolbar.find((e) => e.text === '下载检验报告').disabled = false
			}
			}
			},
			//查看报告按钮
			@@ -374,8 +396,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 +413,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 +459,3 @@
			}
			}
			</script>