From 4c821ffe5879d5acd06190f49dee5b1f86ab6e3b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 17:19:30 +0800
Subject: [PATCH] modified: src/components/view/finishedProductInspectionUp.vue modified: src/components/view/processInspection.vue modified: src/components/view/processInspectionLook.vue modified: src/components/view/processInspectionUpdate.vue modified: src/components/view/technical.vue
---
src/components/view/processInspectionLook.vue | 2 +-
src/components/view/processInspectionUpdate.vue | 10 ++++++++--
src/components/view/finishedProductInspectionUp.vue | 7 +++++++
src/components/view/technical.vue | 4 ++--
src/components/view/processInspection.vue | 8 ++++++--
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index f40a66f..7c421b3 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -323,6 +323,13 @@
id: this.detailId
}).then(res => {
if (res.code == 200) {
+ if(res.message==='椤圭洰鏈楠屽畬!'){
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }
this.$message({
message: '涓婃姤鎴愬姛',
type: 'success'
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index d352b24..da22a3b 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -81,7 +81,7 @@
<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
<el-button type="primary" size="mini" style="background: #004EA2; "
icon="el-icon-circle-plus-outline">鏂板</el-button>
- <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back"
+ <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
style="background: #004EA2; ">杩斿洖</el-button>
</el-col>
</el-row>
@@ -171,7 +171,7 @@
> -->
</el-col>
</el-row>
- <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
+ <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father"></el-table-column>
@@ -355,6 +355,10 @@
this.rowInfp=row
this.showLook=true
},
+ combackIndex(){
+ this.showAddPage=false
+ this.defaultInitializationTable()
+ },
updateInsInfo(row){
this.rowInfp=row
this.showUp=true
diff --git a/src/components/view/processInspectionLook.vue b/src/components/view/processInspectionLook.vue
index 3022239..7784910 100644
--- a/src/components/view/processInspectionLook.vue
+++ b/src/components/view/processInspectionLook.vue
@@ -103,7 +103,7 @@
> -->
</el-col>
</el-row>
- <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
+ <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father"></el-table-column>
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index 9b5f8f9..eb9627c 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -103,7 +103,7 @@
> -->
</el-col>
</el-row>
- <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
+ <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father"></el-table-column>
@@ -323,8 +323,14 @@
this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
id: this.detailId
}).then(res => {
- console.log(res);
if (res.code == 200) {
+ if(res.message==='椤圭洰鏈楠屽畬!'){
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }
this.$message({
message: '涓婃姤鎴愬姛',
type: 'success'
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index ff9bf51..aa90cdd 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -99,7 +99,7 @@
<template slot-scope="scope">
<!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
<el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
- <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
+ <el-button v-if="scope.row.type===0" type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -262,8 +262,8 @@
id:this.compiledata.id
}).then( res =>{
this.$message.success('缂栧埗瀹屾垚')
- })
this.getTechnicalTableData()
+ })
},
async showDetails(row){
--
Gitblit v1.9.3