From d267d7082d3a708e4b2b9f569250a3a588cb54ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 一月 2024 16:54:58 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/index.vue | 106 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 267b919..cad0189 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',
@@ -214,38 +225,8 @@
}
},
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '涓嬭浇妫�楠屾姤鍛�',
- type: 'primary',
- fun: this.downloadReport
- }
- ],
- operator: [
- // {
- // text: '鎵撳嵃',
- // type: 'text',
- // size: 'small',
- // fun: this.previewFun,
- // show: {
- // val: [
- // '1',
- // '0'
- // ],
- // key: 'judgeState'
- // }
- // },
- {
- text: '浣滃簾',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }],
+ toolbar: [],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -255,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: {
@@ -262,7 +244,33 @@
RawMaterialForm,
printTemplate,
},
- created() { },
+ created() {
+ if(this.permissions.quality_rawMaterial_add){
+ this.table.toolbar.push({
+ text: '鏂板',
+ type: 'primary',
+ fun: this.addOrUpdateHandle
+ })
+ }
+ if(this.permissions.quality_rawMaterial_download){
+ this.table.toolbar.push({
+ text: '涓嬭浇妫�楠屾姤鍛�',
+ type: 'primary',
+ loading: false,
+ disabled: false,
+ fun: this.downloadReport,
+
+ })
+ }
+ if(this.permissions.quality_rawMaterial_del){
+ this.table.operator = [{
+ text: '浣滃簾',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }]
+ }
+ },
computed: {
...mapGetters(['permissions'])
},
@@ -291,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
+ }
}
},
//鏌ョ湅鎶ュ憡鎸夐挳
@@ -375,10 +390,16 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.quality_rawMaterial_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
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
}
})
@@ -392,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>"
}
@@ -438,4 +459,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3