From dacb1dd4fefa18fe0199000bc693d8f61a3bd70b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 九月 2023 17:39:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/processInspectionUpdate.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index b2578cc..eb9627c 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -91,7 +91,7 @@
<div class="inspectionProject">
<el-row>
<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
- <el-col :span="12" class="inspectionProject_span">
+ <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span">
<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
<el-button style="margin-right: 30px;" size="mini"
@click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
@@ -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>
@@ -156,7 +156,10 @@
</template>
</el-table-column>
<el-table-column prop="operation" label="涓婃姤">
- <el-button type="primary" @click="escalation" size="small">涓婃姤</el-button>
+ <template slot-scope="scope">
+ <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">涓婃姤</el-button>
+ <el-button v-else type="success" size="small">宸蹭笂鎶�</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -187,6 +190,7 @@
props: ['rowInfo'],
data() {
return {
+ isUpBtn: false,
showUp: false,
isAddProject: false,
detailId: 0,
@@ -275,6 +279,9 @@
}
},
created() {
+ if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
+ this.isUpBtn=true
+ }
this.processInspectVo.orderNumber = this.rowInfo.order_number
this.processInspectVo.material = this.rowInfo.material
this.processInspectVo.materialCode = this.rowInfo.material_code
@@ -316,18 +323,26 @@
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'
});
+ this.$parent.combackMain(true)
} else {
this.$message({
message: res.message,
type: 'warning'
});
}
+
})
},
handleClick() { },
--
Gitblit v1.9.3