From 4e2bb29096ac63837f8d2c5e25766ee094f45d6c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 十二月 2023 14:35:49 +0800
Subject: [PATCH] modified: src/page/index/top/index.vue modified: src/views/common/part.vue modified: src/views/equipment/equipment/index.vue modified: src/views/equipment/metering/index.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/quality/Packaging_ledger/index.vue modified: src/views/quality/packageinspect/index.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/teststandard/index.vue modified: vue.config.js
---
src/views/quality/processInspect/index.vue | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 7059180..2ccb642 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -21,6 +21,7 @@
import * as fecha from 'element-ui/lib/utils/date'
import processInspectForm from './processInspect-form'
import { transform } from '@/util/fileTransform'
+ import { mapGetters } from 'vuex'
import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
export default {
components: {
@@ -67,6 +68,14 @@
minWidth: '120',
prop: 'orderNumber',
label: '璁㈠崟缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'materialCode',
+ label: '浜у搧缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -154,23 +163,8 @@
}
},
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '瀵煎嚭',
- fun: this.exportExcel
- }
- ],
- operator: [{
- text: '浣滃簾',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }],
+ toolbar: [],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -180,7 +174,26 @@
},
}
},
- created() { },
+ computed: {
+ ...mapGetters(['permissions'])
+ },
+ created() {
+ if(this.permissions.quality_processInspect_add){
+ this.table.toolbar.push({
+ text: '鏂板',
+ type: 'primary',
+ fun: this.addOrUpdateHandle
+ })
+ }
+ if(this.permissions.quality_processInspect_del){
+ this.table.operator = [{
+ text: '浣滃簾',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }]
+ }
+ },
methods: {
exportExcel(){
let queryParam=this.$refs.processInspect.getQueryParam();
@@ -207,10 +220,15 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.quality_processInspect_edit && row){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'processInspectForm',
- query: { id: row == null ? null : row.id,resultVal : row == null ? null : row.result },
- })
+ query: { id: row == null ? null : row.id },
+ params: { resultVal : row == null ? null : row.result }
+ })
},
formatResult(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
--
Gitblit v1.9.3