From 7b5549dd6115d42eda331916fdb38ac806169c9b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 13 五月 2024 10:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/processInspect/index.vue | 86 ++++++++++++++++++++++++++++++-------------
1 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index fdc05d8..210b8f1 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -2,7 +2,7 @@
<div class="content-main">
<div class="rawPage">
<basic-container>
- <ttable
+ <ttable
:table="table"
@handleSelectionChange="handleSelectionChange"
:prelang="prelang"
@@ -20,11 +20,13 @@
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
import processInspectForm from './processInspect-form'
- import { page,deleteById } from '@/api/quality/processInspect'
+ import { transform } from '@/util/fileTransform'
+ import { mapGetters } from 'vuex'
+ import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
export default {
components: {
processInspectForm,
- ttable
+ ttable,
},
data() {
return {
@@ -55,12 +57,28 @@
column: [
{
minWidth: '120',
- prop: 'orderNumber',
- label: '璁㈠崟缂栧彿',
+ prop: 'proInsNo',
+ label: '杩囩▼妫�楠岀紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
render: { fun: this.addOrUpdateHandle }
+ },
+ {
+ minWidth: '120',
+ prop: 'orderNumber',
+ label: '璁㈠崟缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'materialCode',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -72,7 +90,6 @@
},
{
minWidth: '130',
- width: '150',
prop: 'specs',
label: '瑙勬牸鍨嬪彿',
sort: true,
@@ -145,22 +162,8 @@
}
},
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '瀵煎嚭',
- }
- ],
- operator: [{
- text: '浣滃簾',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }],
+ toolbar: [],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -170,8 +173,34 @@
},
}
},
- 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();
+ delete queryParam.criteria
+ exportProcessInsProduct(queryParam).then((res)=>{
+ transform(res)
+ })
+ },
deleteHandle(row){
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -190,10 +219,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){
@@ -295,4 +329,4 @@
.rawPage .content-body {
flex: 1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3